diff --git a/server/extension/test/expected/20_street_test.out b/server/extension/test/expected/20_street_test.out
index 3f02e6e..8fbce7a 100644
--- a/server/extension/test/expected/20_street_test.out
+++ b/server/extension/test/expected/20_street_test.out
@@ -4,7 +4,7 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_geocode_street_point'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text, text');
  exists 
 --------
  t
diff --git a/server/extension/test/expected/30_admin0_test.out b/server/extension/test/expected/30_admin0_test.out
index bf164ad..55c7639 100644
--- a/server/extension/test/expected/30_admin0_test.out
+++ b/server/extension/test/expected/30_admin0_test.out
@@ -28,7 +28,7 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_geocode_admin0_polygon'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');
  exists 
 --------
  t
diff --git a/server/extension/test/expected/40_admin1_test.out b/server/extension/test/expected/40_admin1_test.out
index 000ff55..4894b0c 100644
--- a/server/extension/test/expected/40_admin1_test.out
+++ b/server/extension/test/expected/40_admin1_test.out
@@ -40,7 +40,7 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_geocode_admin1_polygon'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');
  exists 
 --------
  t
@@ -51,7 +51,7 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_geocode_admin1_polygon'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
  exists 
 --------
  t
diff --git a/server/extension/test/expected/60_postalcodes_test.out b/server/extension/test/expected/60_postalcodes_test.out
index f671d79..bc7ac56 100644
--- a/server/extension/test/expected/60_postalcodes_test.out
+++ b/server/extension/test/expected/60_postalcodes_test.out
@@ -42,25 +42,25 @@ INSERT INTO admin0_synonyms (adm0_a3, name, name_, rank) VALUES (
   3
 );
 -- This should return the polygon inserted above
-SELECT cdb_dataservices_server.cdb_geocode_postalcode_point('test_user', 'test_org', 'test_app', '03204');
+SELECT cdb_dataservices_server.cdb_geocode_postalcode_point('test_user', 'test_org', '03204');
             cdb_geocode_postalcode_point            
 ----------------------------------------------------
  0101000020E61000000000000000E040408036B47414764840
 (1 row)
 
-SELECT cdb_dataservices_server.cdb_geocode_postalcode_point('test_user', 'test_org', 'test_app', '03204', 'spain');
+SELECT cdb_dataservices_server.cdb_geocode_postalcode_point('test_user', 'test_org', '03204', 'spain');
             cdb_geocode_postalcode_point            
 ----------------------------------------------------
  0101000020E61000000000000000E040408036B47414764840
 (1 row)
 
-SELECT cdb_dataservices_server.cdb_geocode_postalcode_polygon('test_user', 'test_org', 'test_app', '03204');
+SELECT cdb_dataservices_server.cdb_geocode_postalcode_polygon('test_user', 'test_org', '03204');
                                                                             cdb_geocode_postalcode_polygon                                                                            
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  0106000020E610000001000000010300000001000000040000000000000000E000C01F383D7839B740400000000000E000C0AA3C0EDE220F3B4000000000004812404FB7FCCD04893D400000000000E000C01F383D7839B74040
 (1 row)
 
-SELECT cdb_dataservices_server.cdb_geocode_postalcode_polygon('test_user', 'test_org', 'test_app', '03204', 'spain');
+SELECT cdb_dataservices_server.cdb_geocode_postalcode_polygon('test_user', 'test_org', '03204', 'spain');
                                                                             cdb_geocode_postalcode_polygon                                                                            
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  0106000020E610000001000000010300000001000000040000000000000000E000C01F383D7839B740400000000000E000C0AA3C0EDE220F3B4000000000004812404FB7FCCD04893D400000000000E000C01F383D7839B74040
@@ -78,7 +78,7 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_geocode_postalcode_point'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');
  exists 
 --------
  t
@@ -89,7 +89,18 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_geocode_postalcode_point'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
+ exists 
+--------
+ t
+(1 row)
+
+SELECT exists(SELECT *
+              FROM pg_proc p
+              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
+              WHERE ns.nspname = 'cdb_dataservices_server'
+              AND proname = 'cdb_geocode_postalcode_polygon'
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');
  exists 
 --------
  t
@@ -106,17 +117,6 @@ SELECT exists(SELECT *
  t
 (1 row)
 
-SELECT exists(SELECT *
-              FROM pg_proc p
-              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
-              WHERE ns.nspname = 'cdb_dataservices_server'
-              AND proname = 'cdb_geocode_postalcode_polygon'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text');
- exists 
---------
- t
-(1 row)
-
 SELECT exists(SELECT *
               FROM pg_proc p
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
diff --git a/server/extension/test/expected/70_ips_test.out b/server/extension/test/expected/70_ips_test.out
index 39b5886..48012f7 100644
--- a/server/extension/test/expected/70_ips_test.out
+++ b/server/extension/test/expected/70_ips_test.out
@@ -21,7 +21,7 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_geocode_ipaddress_point'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');
  exists 
 --------
  t
diff --git a/server/extension/test/expected/85_isodistance_test.out b/server/extension/test/expected/85_isodistance_test.out
index 2ecbb88..5705284 100644
--- a/server/extension/test/expected/85_isodistance_test.out
+++ b/server/extension/test/expected/85_isodistance_test.out
@@ -4,7 +4,7 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_isodistance'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, geometry, text, integer[], text[]');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, integer[], text[]');
  exists 
 --------
  t
diff --git a/server/extension/test/expected/90_isochrone_test.out b/server/extension/test/expected/90_isochrone_test.out
index 193b59f..7ee0f04 100644
--- a/server/extension/test/expected/90_isochrone_test.out
+++ b/server/extension/test/expected/90_isochrone_test.out
@@ -4,7 +4,7 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_isochrone'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, geometry, text, integer[], text[]');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, integer[], text[]');
  exists 
 --------
  t
diff --git a/server/extension/test/expected/95_route_between_points_test.out b/server/extension/test/expected/95_route_between_points_test.out
index cfc8585..176059f 100644
--- a/server/extension/test/expected/95_route_between_points_test.out
+++ b/server/extension/test/expected/95_route_between_points_test.out
@@ -4,7 +4,7 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_route_point_to_point'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, geometry, geometry, text, text[], text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, geometry, text, text[], text');
  exists 
 --------
  t
@@ -16,7 +16,7 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_route_with_waypoints'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, geometry[], text, text[], text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry[], text, text[], text');
  exists 
 --------
  t
diff --git a/server/extension/test/sql/20_street_test.sql b/server/extension/test/sql/20_street_test.sql
index 1843679..86e0368 100644
--- a/server/extension/test/sql/20_street_test.sql
+++ b/server/extension/test/sql/20_street_test.sql
@@ -4,4 +4,4 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_geocode_street_point'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text, text');
diff --git a/server/extension/test/sql/30_admin0_test.sql b/server/extension/test/sql/30_admin0_test.sql
index ac8911b..3249c60 100644
--- a/server/extension/test/sql/30_admin0_test.sql
+++ b/server/extension/test/sql/30_admin0_test.sql
@@ -22,7 +22,7 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_geocode_admin0_polygon'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');
 
 SELECT exists(SELECT *
               FROM pg_proc p
diff --git a/server/extension/test/sql/40_admin1_test.sql b/server/extension/test/sql/40_admin1_test.sql
index 547cade..7b3748c 100644
--- a/server/extension/test/sql/40_admin1_test.sql
+++ b/server/extension/test/sql/40_admin1_test.sql
@@ -24,14 +24,14 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_geocode_admin1_polygon'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');
 
 SELECT exists(SELECT *
               FROM pg_proc p
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_geocode_admin1_polygon'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
 
 SELECT exists(SELECT *
               FROM pg_proc p
diff --git a/server/extension/test/sql/60_postalcodes_test.sql b/server/extension/test/sql/60_postalcodes_test.sql
index eea2c8f..180def8 100644
--- a/server/extension/test/sql/60_postalcodes_test.sql
+++ b/server/extension/test/sql/60_postalcodes_test.sql
@@ -44,13 +44,13 @@ INSERT INTO admin0_synonyms (adm0_a3, name, name_, rank) VALUES (
 );
 
 -- This should return the polygon inserted above
-SELECT cdb_dataservices_server.cdb_geocode_postalcode_point('test_user', 'test_org', 'test_app', '03204');
+SELECT cdb_dataservices_server.cdb_geocode_postalcode_point('test_user', 'test_org', '03204');
 
-SELECT cdb_dataservices_server.cdb_geocode_postalcode_point('test_user', 'test_org', 'test_app', '03204', 'spain');
+SELECT cdb_dataservices_server.cdb_geocode_postalcode_point('test_user', 'test_org', '03204', 'spain');
 
-SELECT cdb_dataservices_server.cdb_geocode_postalcode_polygon('test_user', 'test_org', 'test_app', '03204');
+SELECT cdb_dataservices_server.cdb_geocode_postalcode_polygon('test_user', 'test_org', '03204');
 
-SELECT cdb_dataservices_server.cdb_geocode_postalcode_polygon('test_user', 'test_org', 'test_app', '03204', 'spain');
+SELECT cdb_dataservices_server.cdb_geocode_postalcode_polygon('test_user', 'test_org', '03204', 'spain');
 
 -- Clean dbs
 DELETE FROM global_postal_code_points;
@@ -65,14 +65,21 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_geocode_postalcode_point'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');
 
 SELECT exists(SELECT *
               FROM pg_proc p
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_geocode_postalcode_point'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
+
+SELECT exists(SELECT *
+              FROM pg_proc p
+              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
+              WHERE ns.nspname = 'cdb_dataservices_server'
+              AND proname = 'cdb_geocode_postalcode_polygon'
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');
 
 SELECT exists(SELECT *
               FROM pg_proc p
@@ -81,13 +88,6 @@ SELECT exists(SELECT *
               AND proname = 'cdb_geocode_postalcode_polygon'
               AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
 
-SELECT exists(SELECT *
-              FROM pg_proc p
-              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
-              WHERE ns.nspname = 'cdb_dataservices_server'
-              AND proname = 'cdb_geocode_postalcode_polygon'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text');
-
 SELECT exists(SELECT *
               FROM pg_proc p
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
diff --git a/server/extension/test/sql/70_ips_test.sql b/server/extension/test/sql/70_ips_test.sql
index ba69842..6111bd0 100644
--- a/server/extension/test/sql/70_ips_test.sql
+++ b/server/extension/test/sql/70_ips_test.sql
@@ -14,7 +14,7 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_geocode_ipaddress_point'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');
 
 SELECT exists(SELECT *
               FROM pg_proc p
diff --git a/server/extension/test/sql/85_isodistance_test.sql b/server/extension/test/sql/85_isodistance_test.sql
index 4f5c37f..f66b68a 100644
--- a/server/extension/test/sql/85_isodistance_test.sql
+++ b/server/extension/test/sql/85_isodistance_test.sql
@@ -4,4 +4,4 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_isodistance'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, geometry, text, integer[], text[]');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, integer[], text[]');
diff --git a/server/extension/test/sql/90_isochrone_test.sql b/server/extension/test/sql/90_isochrone_test.sql
index 60819bc..113fb28 100644
--- a/server/extension/test/sql/90_isochrone_test.sql
+++ b/server/extension/test/sql/90_isochrone_test.sql
@@ -4,4 +4,4 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_isochrone'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, geometry, text, integer[], text[]');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, text, integer[], text[]');
diff --git a/server/extension/test/sql/95_route_between_points_test.sql b/server/extension/test/sql/95_route_between_points_test.sql
index 21fe257..4acc15d 100644
--- a/server/extension/test/sql/95_route_between_points_test.sql
+++ b/server/extension/test/sql/95_route_between_points_test.sql
@@ -4,7 +4,7 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_route_point_to_point'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, geometry, geometry, text, text[], text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry, geometry, text, text[], text');
 
 -- Check for routing waypoint route signatures
 SELECT exists(SELECT *
@@ -12,4 +12,4 @@ SELECT exists(SELECT *
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
               AND proname = 'cdb_route_with_waypoints'
-              AND oidvectortypes(p.proargtypes)  = 'text, text, text, geometry[], text, text[], text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, geometry[], text, text[], text');