diff --git a/client/cdb_dataservices_client--0.18.0--0.19.0.sql b/client/cdb_dataservices_client--0.18.0--0.19.0.sql
new file mode 100644
index 0000000..d851050
--- /dev/null
+++ b/client/cdb_dataservices_client--0.18.0--0.19.0.sql
@@ -0,0 +1,71 @@
+--DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES
+-- Complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "ALTER EXTENSION cdb_dataservices_client UPDATE TO '0.19.0'" to load this file. \quit
+
+-- Make sure we have a sane search path to create/update the extension
+SET search_path = "$user",cartodb,public,cdb_dataservices_client;
+
+-- HERE goes your code to upgrade/downgrade
+CREATE OR REPLACE FUNCTION cdb_dataservices_client._obs_getnumerators (bounds geometry(Geometry, 4326) DEFAULT NULL ,section_tags text[] DEFAULT ARRAY[]::TEXT[] ,subsection_tags text[] DEFAULT ARRAY[]::TEXT[] ,other_tags text[] DEFAULT ARRAY[]::TEXT[] ,ids text[] DEFAULT ARRAY[]::TEXT[] ,name text DEFAULT NULL ,denom_id text DEFAULT '' ,geom_id text DEFAULT '' ,timespan text DEFAULT '')
+RETURNS SETOF cdb_dataservices_client.obs_meta_numerator AS $$
+DECLARE
+
+  username text;
+  orgname text;
+BEGIN
+  IF session_user = 'publicuser' OR session_user ~ 'cartodb_publicuser_*' THEN
+    RAISE EXCEPTION 'The api_key must be provided';
+  END IF;
+  SELECT u, o INTO username, orgname FROM cdb_dataservices_client._cdb_entity_config() AS (u text, o text);
+  -- JSON value stored "" is taken as literal
+  IF username IS NULL OR username = '' OR username = '""' THEN
+    RAISE EXCEPTION 'Username is a mandatory argument, check it out';
+  END IF;
+
+  RETURN QUERY SELECT * FROM cdb_dataservices_client.__obs_getnumerators(username, orgname, bounds, section_tags, subsection_tags, other_tags, ids, name, denom_id, geom_id, timespan);
+END;
+$$ LANGUAGE 'plpgsql' SECURITY DEFINER;
+
+CREATE OR REPLACE FUNCTION cdb_dataservices_client.__obs_getnumerators_exception_safe (bounds geometry(Geometry, 4326) DEFAULT NULL ,section_tags text[] DEFAULT ARRAY[]::TEXT[] ,subsection_tags text[] DEFAULT ARRAY[]::TEXT[] ,other_tags text[] DEFAULT ARRAY[]::TEXT[] ,ids text[] DEFAULT ARRAY[]::TEXT[] ,name text DEFAULT NULL ,denom_id text DEFAULT '' ,geom_id text DEFAULT '' ,timespan text DEFAULT '')
+RETURNS SETOF cdb_dataservices_client.obs_meta_numerator AS $$
+DECLARE
+
+  username text;
+  orgname text;
+  _returned_sqlstate TEXT;
+  _message_text TEXT;
+  _pg_exception_context TEXT;
+BEGIN
+  IF session_user = 'publicuser' OR session_user ~ 'cartodb_publicuser_*' THEN
+    RAISE EXCEPTION 'The api_key must be provided';
+  END IF;
+  SELECT u, o INTO username, orgname FROM cdb_dataservices_client._cdb_entity_config() AS (u text, o text);
+  -- JSON value stored "" is taken as literal
+  IF username IS NULL OR username = '' OR username = '""' THEN
+    RAISE EXCEPTION 'Username is a mandatory argument, check it out';
+  END IF;
+
+
+  BEGIN
+    RETURN QUERY SELECT * FROM cdb_dataservices_client.__obs_getnumerators(username, orgname, bounds, section_tags, subsection_tags, other_tags, ids, name, denom_id, geom_id, timespan);
+  EXCEPTION
+    WHEN OTHERS THEN
+        GET STACKED DIAGNOSTICS _returned_sqlstate = RETURNED_SQLSTATE,
+                                _message_text = MESSAGE_TEXT,
+                                _pg_exception_context = PG_EXCEPTION_CONTEXT;
+        RAISE WARNING USING ERRCODE = _returned_sqlstate, MESSAGE = _message_text, DETAIL = _pg_exception_context;
+
+  END;
+END;
+$$ LANGUAGE 'plpgsql' SECURITY DEFINER;
+
+CREATE OR REPLACE FUNCTION cdb_dataservices_client.__obs_getnumerators (username text, orgname text, bounds geometry(Geometry, 4326) DEFAULT NULL, section_tags text[] DEFAULT ARRAY[]::TEXT[], subsection_tags text[] DEFAULT ARRAY[]::TEXT[], other_tags text[] DEFAULT ARRAY[]::TEXT[], ids text[] DEFAULT ARRAY[]::TEXT[], name text DEFAULT NULL, denom_id text DEFAULT '', geom_id text DEFAULT '', timespan text DEFAULT '')
+RETURNS SETOF cdb_dataservices_client.obs_meta_numerator AS $$
+  CONNECT cdb_dataservices_client._server_conn_str();
+
+  SELECT * FROM cdb_dataservices_server._obs_getnumerators (username, orgname, bounds, section_tags, subsection_tags, other_tags, ids, name, denom_id, geom_id, timespan);
+
+$$ LANGUAGE plproxy;
+
+GRANT EXECUTE ON FUNCTION cdb_dataservices_client._obs_getnumerators(bounds geometry(Geometry, 4326), section_tags text[], subsection_tags text[], other_tags text[], ids text[], name text, denom_id text, geom_id text, timespan text) TO publicuser;
+GRANT EXECUTE ON FUNCTION cdb_dataservices_client.__obs_getnumerators_exception_safe(bounds geometry(Geometry, 4326), section_tags text[], subsection_tags text[], other_tags text[], ids text[], name text, denom_id text, geom_id text, timespan text )  TO publicuser;
diff --git a/client/cdb_dataservices_client--0.19.0--0.18.0.sql b/client/cdb_dataservices_client--0.19.0--0.18.0.sql
new file mode 100644
index 0000000..e04d46f
--- /dev/null
+++ b/client/cdb_dataservices_client--0.19.0--0.18.0.sql
@@ -0,0 +1,11 @@
+--DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES
+-- Complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "ALTER EXTENSION cdb_dataservices_client UPDATE TO '0.18.0'" to load this file. \quit
+
+-- Make sure we have a sane search path to create/update the extension
+SET search_path = "$user",cartodb,public,cdb_dataservices_client;
+
+-- HERE goes your code to upgrade/downgrade
+DROP IF EXISTS FUNCTION cdb_dataservices_client._obs_getnumerators (geometry(Geometry, 4326), text[], text[] , text[], text[] , text, text, text,text);
+DROP IF EXISTS FUNCTION cdb_dataservices_client.__obs_getnumerators_exception_safe (geometry(Geometry, 4326), text[], text[] , text[], text[] , text, text, text,text);
+DROP IF EXISTS FUNCTION cdb_dataservices_client.__obs_getnumerators (text, text, geometry(Geometry, 4326), text[], text[] , text[], text[] , text, text, text,text);
diff --git a/client/cdb_dataservices_client.control b/client/cdb_dataservices_client.control
index 091f406..aebb267 100644
--- a/client/cdb_dataservices_client.control
+++ b/client/cdb_dataservices_client.control
@@ -1,5 +1,5 @@
 comment = 'CartoDB dataservices client API extension'
-default_version = '0.18.0'
+default_version = '0.19.0'
 requires = 'plproxy, cartodb'
 superuser = true
 schema = cdb_dataservices_client
diff --git a/client/cdb_dataservices_client--0.17.0--0.18.0.sql b/client/old_versions/cdb_dataservices_client--0.17.0--0.18.0.sql
similarity index 90%
rename from client/cdb_dataservices_client--0.17.0--0.18.0.sql
rename to client/old_versions/cdb_dataservices_client--0.17.0--0.18.0.sql
index 62b4b2b..4ec3498 100644
--- a/client/cdb_dataservices_client--0.17.0--0.18.0.sql
+++ b/client/old_versions/cdb_dataservices_client--0.17.0--0.18.0.sql
@@ -5,6 +5,7 @@
 -- Make sure we have a sane search path to create/update the extension
 SET search_path = "$user",cartodb,public,cdb_dataservices_client;
 
+
 -- Due to an inconsistency between the v0.17.0 script on one side, and the source sql files
 -- (namely 16_custon_types) and incremental migration scripts on the other (from/to 0.16.0),
 -- the order of the fields of the obs_meta_geometry and obs_meta_timespan types
@@ -68,16 +69,10 @@ $$ LANGUAGE 'plpgsql' SECURITY DEFINER;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._obs_getavailablegeometries_exception_safe (bounds geometry(Geometry, 4326) DEFAULT NULL ,filter_tags text[] DEFAULT NULL ,numer_id text DEFAULT NULL ,denom_id text DEFAULT NULL ,timespan text DEFAULT NULL)
 RETURNS SETOF cdb_dataservices_client.obs_meta_geometry AS $$
-=======
--- HERE goes your code to upgrade/downgrade
-CREATE OR REPLACE FUNCTION cdb_dataservices_client._obs_getnumerators (bounds geometry(Geometry, 4326) DEFAULT NULL ,section_tags text[] DEFAULT ARRAY[]::TEXT[] ,subsection_tags text[] DEFAULT ARRAY[]::TEXT[] ,other_tags text[] DEFAULT ARRAY[]::TEXT[] ,ids text[] DEFAULT ARRAY[]::TEXT[] ,name text DEFAULT NULL ,denom_id text DEFAULT '' ,geom_id text DEFAULT '' ,timespan text DEFAULT '')
-RETURNS SETOF cdb_dataservices_client.obs_meta_numerator AS $$
->>>>>>> New DO function _OBS_GetNumerators
 DECLARE
 
   username text;
   orgname text;
-<<<<<<< HEAD
   _returned_sqlstate TEXT;
   _message_text TEXT;
   _pg_exception_context TEXT;
@@ -204,8 +199,6 @@ DECLARE
   ret Geometry;
   username text;
   orgname text;
-=======
->>>>>>> New DO function _OBS_GetNumerators
 BEGIN
   IF session_user = 'publicuser' OR session_user ~ 'cartodb_publicuser_*' THEN
     RAISE EXCEPTION 'The api_key must be provided';
@@ -216,7 +209,6 @@ BEGIN
     RAISE EXCEPTION 'Username is a mandatory argument, check it out';
   END IF;
 
-<<<<<<< HEAD
   SELECT cdb_dataservices_client._cdb_geocode_postalcode_polygon(username, orgname, postal_code, country_name) INTO ret; RETURN ret;
 END;
 $$ LANGUAGE 'plpgsql' SECURITY DEFINER;
@@ -247,16 +239,6 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_postalcode_polyg
 RETURNS Geometry AS $$
 DECLARE
   ret Geometry;
-=======
-  RETURN QUERY SELECT * FROM cdb_dataservices_client.__obs_getnumerators(username, orgname, bounds, section_tags, subsection_tags, other_tags, ids, name, denom_id, geom_id, timespan);
-END;
-$$ LANGUAGE 'plpgsql' SECURITY DEFINER;
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_client.__obs_getnumerators_exception_safe (bounds geometry(Geometry, 4326) DEFAULT NULL ,section_tags text[] DEFAULT ARRAY[]::TEXT[] ,subsection_tags text[] DEFAULT ARRAY[]::TEXT[] ,other_tags text[] DEFAULT ARRAY[]::TEXT[] ,ids text[] DEFAULT ARRAY[]::TEXT[] ,name text DEFAULT NULL ,denom_id text DEFAULT '' ,geom_id text DEFAULT '' ,timespan text DEFAULT '')
-RETURNS SETOF cdb_dataservices_client.obs_meta_numerator AS $$
-DECLARE
-
->>>>>>> New DO function _OBS_GetNumerators
   username text;
   orgname text;
   _returned_sqlstate TEXT;
@@ -274,18 +256,13 @@ BEGIN
 
 
   BEGIN
-<<<<<<< HEAD
     SELECT cdb_dataservices_client._cdb_geocode_postalcode_polygon(username, orgname, postal_code, country_name) INTO ret; RETURN ret;
-=======
-    RETURN QUERY SELECT * FROM cdb_dataservices_client.__obs_getnumerators(username, orgname, bounds, section_tags, subsection_tags, other_tags, ids, name, denom_id, geom_id, timespan);
->>>>>>> New DO function _OBS_GetNumerators
   EXCEPTION
     WHEN OTHERS THEN
         GET STACKED DIAGNOSTICS _returned_sqlstate = RETURNED_SQLSTATE,
                                 _message_text = MESSAGE_TEXT,
                                 _pg_exception_context = PG_EXCEPTION_CONTEXT;
         RAISE WARNING USING ERRCODE = _returned_sqlstate, MESSAGE = _message_text, DETAIL = _pg_exception_context;
-<<<<<<< HEAD
          RETURN ret;
   END;
 END;
@@ -321,14 +298,10 @@ BEGIN
                                 _pg_exception_context = PG_EXCEPTION_CONTEXT;
         RAISE WARNING USING ERRCODE = _returned_sqlstate, MESSAGE = _message_text, DETAIL = _pg_exception_context;
          RETURN ret;
-=======
-
->>>>>>> New DO function _OBS_GetNumerators
   END;
 END;
 $$ LANGUAGE 'plpgsql' SECURITY DEFINER;
 
-<<<<<<< HEAD
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_geocode_postalcode_polygon (username text, orgname text, postal_code double precision, country_name text)
 RETURNS Geometry AS $$
   CONNECT cdb_dataservices_client._server_conn_str();
diff --git a/client/cdb_dataservices_client--0.18.0--0.17.0.sql b/client/old_versions/cdb_dataservices_client--0.18.0--0.17.0.sql
similarity index 100%
rename from client/cdb_dataservices_client--0.18.0--0.17.0.sql
rename to client/old_versions/cdb_dataservices_client--0.18.0--0.17.0.sql
diff --git a/client/cdb_dataservices_client--0.18.0.sql b/client/old_versions/cdb_dataservices_client--0.18.0.sql
similarity index 100%
rename from client/cdb_dataservices_client--0.18.0.sql
rename to client/old_versions/cdb_dataservices_client--0.18.0.sql
diff --git a/server/extension/cdb_dataservices_server--0.25.0--0.26.0.sql b/server/extension/cdb_dataservices_server--0.25.0--0.26.0.sql
new file mode 100644
index 0000000..b0d5812
--- /dev/null
+++ b/server/extension/cdb_dataservices_server--0.25.0--0.26.0.sql
@@ -0,0 +1,20 @@
+--DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES
+-- Complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "ALTER EXTENSION cdb_dataservices_server UPDATE TO '0.25.0'" to load this file. \quit
+
+CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetNumerators(
+  username TEXT,
+  orgname TEXT,
+  bounds geometry(Geometry, 4326) DEFAULT NULL,
+  section_tags TEXT[] DEFAULT ARRAY[]::TEXT[],
+  subsection_tags TEXT[] DEFAULT ARRAY[]::TEXT[],
+  other_tags TEXT[] DEFAULT ARRAY[]::TEXT[],
+  ids TEXT[] DEFAULT ARRAY[]::TEXT[],
+  name TEXT DEFAULT NULL,
+  denom_id TEXT DEFAULT '',
+  geom_id TEXT DEFAULT '',
+  timespan TEXT DEFAULT '')
+RETURNS SETOF cdb_dataservices_server.obs_meta_numerator AS $$
+  CONNECT cdb_dataservices_server._obs_server_conn_str(username, orgname);
+  SELECT * FROM cdb_observatory._OBS_GetNumerators(bounds, section_tags, subsection_tags, other_tags, ids, name, denom_id, geom_id, timespan);
+$$ LANGUAGE plproxy;
diff --git a/server/extension/cdb_dataservices_server--0.26.0--0.25.0.sql b/server/extension/cdb_dataservices_server--0.26.0--0.25.0.sql
new file mode 100644
index 0000000..80fd533
--- /dev/null
+++ b/server/extension/cdb_dataservices_server--0.26.0--0.25.0.sql
@@ -0,0 +1,5 @@
+--DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES
+-- Complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "ALTER EXTENSION cdb_dataservices_server UPDATE TO '0.24.2'" to load this file. \quit
+
+DROP IF EXISTS FUNCTION cdb_dataservices_server._OBS_GetNumerators (text, text, geometry(Geometry, 4326), text[], text[] , text[], text[] , text, text, text,text);
diff --git a/server/extension/cdb_dataservices_server.control b/server/extension/cdb_dataservices_server.control
index 81bc98c..7549dfa 100644
--- a/server/extension/cdb_dataservices_server.control
+++ b/server/extension/cdb_dataservices_server.control
@@ -1,5 +1,5 @@
 comment = 'CartoDB dataservices server extension'
-default_version = '0.25.0'
+default_version = '0.26.0'
 requires = 'plpythonu, plproxy, postgis, cdb_geocoder'
 superuser = true
 schema = cdb_dataservices_server
diff --git a/server/extension/cdb_dataservices_server--0.24.2--0.25.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.24.2--0.25.0.sql
similarity index 99%
rename from server/extension/cdb_dataservices_server--0.24.2--0.25.0.sql
rename to server/extension/old_versions/cdb_dataservices_server--0.24.2--0.25.0.sql
index 840e3db..8cbbfb9 100644
--- a/server/extension/cdb_dataservices_server--0.24.2--0.25.0.sql
+++ b/server/extension/old_versions/cdb_dataservices_server--0.24.2--0.25.0.sql
@@ -21,3 +21,4 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_postalcode_polygo
 RETURNS Geometry AS $$
   SELECT cdb_dataservices_server.cdb_geocode_postalcode_polygon(username, orgname, code::text, country);
 $$ LANGUAGE SQL;
+
diff --git a/server/extension/cdb_dataservices_server--0.25.0--0.24.2.sql b/server/extension/old_versions/cdb_dataservices_server--0.25.0--0.24.2.sql
similarity index 100%
rename from server/extension/cdb_dataservices_server--0.25.0--0.24.2.sql
rename to server/extension/old_versions/cdb_dataservices_server--0.25.0--0.24.2.sql
diff --git a/server/extension/cdb_dataservices_server--0.25.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.25.0.sql
similarity index 100%
rename from server/extension/cdb_dataservices_server--0.25.0.sql
rename to server/extension/old_versions/cdb_dataservices_server--0.25.0.sql