diff --git a/apps/location/migrations/migrate_lang.sql b/apps/location/migrations/migrate_lang.sql
index 409e7bf3..25364e64 100644
--- a/apps/location/migrations/migrate_lang.sql
+++ b/apps/location/migrations/migrate_lang.sql
@@ -3,18 +3,18 @@ delete from location_country_languages;
 delete from translation_language as tl; 
 delete from location_country as lc; 
 
-CREATE TABLE public.codelang (
+CREATE TABLE codelang (
 	code varchar(100) NULL,
 	country varchar(10000) NULL
 );
 
 -- Permissions
 
-ALTER TABLE public.codelang OWNER TO postgres;
-GRANT ALL ON TABLE public.codelang TO postgres;
+ALTER TABLE codelang OWNER TO postgres;
+GRANT ALL ON TABLE codelang TO postgres;
 
 
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('af','Afrikaans')
 ,('af-ZA','Afrikaans (South Africa)')
 ,('ar','Arabic')
@@ -26,7 +26,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('ar-JO','Arabic (Jordan)')
 ,('ar-KW','Arabic (Kuwait)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('ar-LB','Arabic (Lebanon)')
 ,('ar-LY','Arabic (Libya)')
 ,('ar-MA','Arabic (Morocco)')
@@ -38,7 +38,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('ar-YE','Arabic (Yemen)')
 ,('az','Azeri (Latin)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('az-AZ','Azeri (Latin) (Azerbaijan)')
 ,('az-AZ','Azeri (Cyrillic) (Azerbaijan)')
 ,('be','Belarusian')
@@ -50,7 +50,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('ca-ES','Catalan (Spain)')
 ,('cs','Czech')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('cs-CZ','Czech (Czech Republic)')
 ,('cy','Welsh')
 ,('cy-GB','Welsh (United Kingdom)')
@@ -62,7 +62,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('de-DE','German (Germany)')
 ,('de-LI','German (Liechtenstein)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('de-LU','German (Luxembourg)')
 ,('dv','Divehi')
 ,('dv-MV','Divehi (Maldives)')
@@ -74,7 +74,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('en-CA','English (Canada)')
 ,('en-CB','English (Caribbean)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('en-GB','English (United Kingdom)')
 ,('en-IE','English (Ireland)')
 ,('en-JM','English (Jamaica)')
@@ -86,7 +86,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('en-ZW','English (Zimbabwe)')
 ,('eo','Esperanto')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('es','Spanish')
 ,('es-AR','Spanish (Argentina)')
 ,('es-BO','Spanish (Bolivia)')
@@ -98,7 +98,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('es-ES','Spanish (Castilian)')
 ,('es-ES','Spanish (Spain)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('es-GT','Spanish (Guatemala)')
 ,('es-HN','Spanish (Honduras)')
 ,('es-MX','Spanish (Mexico)')
@@ -110,7 +110,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('es-SV','Spanish (El Salvador)')
 ,('es-UY','Spanish (Uruguay)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('es-VE','Spanish (Venezuela)')
 ,('et','Estonian')
 ,('et-EE','Estonian (Estonia)')
@@ -122,7 +122,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('fi-FI','Finnish (Finland)')
 ,('fo','Faroese')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('fo-FO','Faroese (Faroe Islands)')
 ,('fr','French')
 ,('fr-BE','French (Belgium)')
@@ -134,7 +134,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('gl','Galician')
 ,('gl-ES','Galician (Spain)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('gu','Gujarati')
 ,('gu-IN','Gujarati (India)')
 ,('he','Hebrew')
@@ -146,7 +146,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('hr-HR','Croatian (Croatia)')
 ,('hu','Hungarian')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('hu-HU','Hungarian (Hungary)')
 ,('hy','Armenian')
 ,('hy-AM','Armenian (Armenia)')
@@ -158,7 +158,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('it-CH','Italian (Switzerland)')
 ,('it-IT','Italian (Italy)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('ja','Japanese')
 ,('ja-JP','Japanese (Japan)')
 ,('ka','Georgian')
@@ -170,7 +170,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('ko','Korean')
 ,('ko-KR','Korean (Korea)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('kok','Konkani')
 ,('kok-IN','Konkani (India)')
 ,('ky','Kyrgyz')
@@ -182,7 +182,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('mi','Maori')
 ,('mi-NZ','Maori (New Zealand)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('mk','FYRO Macedonian')
 ,('mk-MK','FYRO Macedonian (Former Yugoslav Republic of Macedonia)')
 ,('mn','Mongolian')
@@ -194,7 +194,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('ms-MY','Malay (Malaysia)')
 ,('mt','Maltese')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('mt-MT','Maltese (Malta)')
 ,('nb','Norwegian (Bokm?l)')
 ,('nb-NO','Norwegian (Bokm?l) (Norway)')
@@ -206,7 +206,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('ns-ZA','Northern Sotho (South Africa)')
 ,('pa','Punjabi')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('pa-IN','Punjabi (India)')
 ,('pl','Polish')
 ,('pl-PL','Polish (Poland)')
@@ -218,7 +218,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('qu','Quechua')
 ,('qu-BO','Quechua (Bolivia)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('qu-EC','Quechua (Ecuador)')
 ,('qu-PE','Quechua (Peru)')
 ,('ro','Romanian')
@@ -230,7 +230,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('se','Sami (Northern)')
 ,('se-FI','Sami (Northern) (Finland)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('se-FI','Sami (Skolt) (Finland)')
 ,('se-FI','Sami (Inari) (Finland)')
 ,('se-NO','Sami (Northern) (Norway)')
@@ -242,7 +242,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('sk','Slovak')
 ,('sk-SK','Slovak (Slovakia)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('sl','Slovenian')
 ,('sl-SI','Slovenian (Slovenia)')
 ,('sq','Albanian')
@@ -254,7 +254,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('sv','Swedish')
 ,('sv-FI','Swedish (Finland)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('sv-SE','Swedish (Sweden)')
 ,('sw','Swahili')
 ,('sw-KE','Swahili (Kenya)')
@@ -266,7 +266,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('te-IN','Telugu (India)')
 ,('th','Thai')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('th-TH','Thai (Thailand)')
 ,('tl','Tagalog')
 ,('tl-PH','Tagalog (Philippines)')
@@ -278,7 +278,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('tt-RU','Tatar (Russia)')
 ,('ts','Tsonga')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('uk','Ukrainian')
 ,('uk-UA','Ukrainian (Ukraine)')
 ,('ur','Urdu')
@@ -290,7 +290,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('vi-VN','Vietnamese (Viet Nam)')
 ,('xh','Xhosa')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('xh-ZA','Xhosa (South Africa)')
 ,('zh','Chinese')
 ,('zh-CN','Chinese (S)')
@@ -304,7 +304,7 @@ INSERT INTO public.codelang (code,country) VALUES
 /***************************/
 -- Manual migrate
 
-CREATE TABLE public.country_code (
+CREATE TABLE country_code (
 	code varchar(100) NULL,
 	country varchar(10000) NULL
 );
@@ -332,7 +332,7 @@ commit;
 
 --delete from location_country as lc 
 
-INSERT INTO public.location_country
+INSERT INTO location_country
 (code, "name", low_price, high_price, created, modified)
 select	
 	lpad((row_number() over (order by t.country asc))::text, 3, '0') as code,		
@@ -353,7 +353,7 @@ commit;
 
 --delete from translation_language as tl; 
 
-INSERT INTO public.translation_language
+INSERT INTO translation_language
 (title, locale)
 select
 	t.country as title,
@@ -371,7 +371,7 @@ commit;
 
 --delete from location_country_languages
 
-INSERT INTO public.location_country_languages
+INSERT INTO location_country_languages
 (country_id, language_id)
 select lc.id as country_id, 
 	   l.id as language_id      
diff --git a/apps/location/migrations/remigrate_lang.sql b/apps/location/migrations/remigrate_lang.sql
index 910dfcfa..35033cdb 100644
--- a/apps/location/migrations/remigrate_lang.sql
+++ b/apps/location/migrations/remigrate_lang.sql
@@ -1,15 +1,15 @@
-CREATE TABLE public.codelang (
+CREATE TABLE codelang (
 	code varchar(100) NULL,
 	country varchar(10000) NULL
 );
 
 -- Permissions
 
-ALTER TABLE public.codelang OWNER TO postgres;
-GRANT ALL ON TABLE public.codelang TO postgres;
+ALTER TABLE codelang OWNER TO postgres;
+GRANT ALL ON TABLE codelang TO postgres;
 
 
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('af','Afrikaans')
 ,('af-ZA','Afrikaans (South Africa)')
 ,('ar','Arabic')
@@ -21,7 +21,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('ar-JO','Arabic (Jordan)')
 ,('ar-KW','Arabic (Kuwait)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('ar-LB','Arabic (Lebanon)')
 ,('ar-LY','Arabic (Libya)')
 ,('ar-MA','Arabic (Morocco)')
@@ -33,7 +33,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('ar-YE','Arabic (Yemen)')
 ,('az','Azeri (Latin)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('az-AZ','Azeri (Latin) (Azerbaijan)')
 ,('az-AZ','Azeri (Cyrillic) (Azerbaijan)')
 ,('be','Belarusian')
@@ -45,7 +45,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('ca-ES','Catalan (Spain)')
 ,('cs','Czech')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('cs-CZ','Czech (Czech Republic)')
 ,('cy','Welsh')
 ,('cy-GB','Welsh (United Kingdom)')
@@ -57,7 +57,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('de-DE','German (Germany)')
 ,('de-LI','German (Liechtenstein)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('de-LU','German (Luxembourg)')
 ,('dv','Divehi')
 ,('dv-MV','Divehi (Maldives)')
@@ -69,7 +69,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('en-CA','English (Canada)')
 ,('en-CB','English (Caribbean)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('en-GB','English (United Kingdom)')
 ,('en-IE','English (Ireland)')
 ,('en-JM','English (Jamaica)')
@@ -81,7 +81,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('en-ZW','English (Zimbabwe)')
 ,('eo','Esperanto')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('es','Spanish')
 ,('es-AR','Spanish (Argentina)')
 ,('es-BO','Spanish (Bolivia)')
@@ -93,7 +93,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('es-ES','Spanish (Castilian)')
 ,('es-ES','Spanish (Spain)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('es-GT','Spanish (Guatemala)')
 ,('es-HN','Spanish (Honduras)')
 ,('es-MX','Spanish (Mexico)')
@@ -105,7 +105,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('es-SV','Spanish (El Salvador)')
 ,('es-UY','Spanish (Uruguay)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('es-VE','Spanish (Venezuela)')
 ,('et','Estonian')
 ,('et-EE','Estonian (Estonia)')
@@ -117,7 +117,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('fi-FI','Finnish (Finland)')
 ,('fo','Faroese')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('fo-FO','Faroese (Faroe Islands)')
 ,('fr','French')
 ,('fr-BE','French (Belgium)')
@@ -129,7 +129,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('gl','Galician')
 ,('gl-ES','Galician (Spain)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('gu','Gujarati')
 ,('gu-IN','Gujarati (India)')
 ,('he','Hebrew')
@@ -141,7 +141,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('hr-HR','Croatian (Croatia)')
 ,('hu','Hungarian')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('hu-HU','Hungarian (Hungary)')
 ,('hy','Armenian')
 ,('hy-AM','Armenian (Armenia)')
@@ -153,7 +153,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('it-CH','Italian (Switzerland)')
 ,('it-IT','Italian (Italy)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('ja','Japanese')
 ,('ja-JP','Japanese (Japan)')
 ,('ka','Georgian')
@@ -165,7 +165,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('ko','Korean')
 ,('ko-KR','Korean (Korea)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('kok','Konkani')
 ,('kok-IN','Konkani (India)')
 ,('ky','Kyrgyz')
@@ -177,7 +177,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('mi','Maori')
 ,('mi-NZ','Maori (New Zealand)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('mk','FYRO Macedonian')
 ,('mk-MK','FYRO Macedonian (Former Yugoslav Republic of Macedonia)')
 ,('mn','Mongolian')
@@ -189,7 +189,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('ms-MY','Malay (Malaysia)')
 ,('mt','Maltese')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('mt-MT','Maltese (Malta)')
 ,('nb','Norwegian (Bokm?l)')
 ,('nb-NO','Norwegian (Bokm?l) (Norway)')
@@ -201,7 +201,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('ns-ZA','Northern Sotho (South Africa)')
 ,('pa','Punjabi')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('pa-IN','Punjabi (India)')
 ,('pl','Polish')
 ,('pl-PL','Polish (Poland)')
@@ -213,7 +213,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('qu','Quechua')
 ,('qu-BO','Quechua (Bolivia)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('qu-EC','Quechua (Ecuador)')
 ,('qu-PE','Quechua (Peru)')
 ,('ro','Romanian')
@@ -225,7 +225,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('se','Sami (Northern)')
 ,('se-FI','Sami (Northern) (Finland)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('se-FI','Sami (Skolt) (Finland)')
 ,('se-FI','Sami (Inari) (Finland)')
 ,('se-NO','Sami (Northern) (Norway)')
@@ -237,7 +237,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('sk','Slovak')
 ,('sk-SK','Slovak (Slovakia)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('sl','Slovenian')
 ,('sl-SI','Slovenian (Slovenia)')
 ,('sq','Albanian')
@@ -249,7 +249,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('sv','Swedish')
 ,('sv-FI','Swedish (Finland)')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('sv-SE','Swedish (Sweden)')
 ,('sw','Swahili')
 ,('sw-KE','Swahili (Kenya)')
@@ -261,7 +261,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('te-IN','Telugu (India)')
 ,('th','Thai')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('th-TH','Thai (Thailand)')
 ,('tl','Tagalog')
 ,('tl-PH','Tagalog (Philippines)')
@@ -273,7 +273,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('tt-RU','Tatar (Russia)')
 ,('ts','Tsonga')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('uk','Ukrainian')
 ,('uk-UA','Ukrainian (Ukraine)')
 ,('ur','Urdu')
@@ -285,7 +285,7 @@ INSERT INTO public.codelang (code,country) VALUES
 ,('vi-VN','Vietnamese (Viet Nam)')
 ,('xh','Xhosa')
 ;
-INSERT INTO public.codelang (code,country) VALUES 
+INSERT INTO codelang (code,country) VALUES 
 ('xh-ZA','Xhosa (South Africa)')
 ,('zh','Chinese')
 ,('zh-CN','Chinese (S)')
@@ -299,7 +299,7 @@ INSERT INTO public.codelang (code,country) VALUES
 /***************************/
 -- Manual migrate
 
-CREATE TABLE public.country_code (
+CREATE TABLE country_code (
 	code varchar(100) NULL,
 	country varchar(10000) NULL
 );