diff --git a/src/pg/sql/41_observatory_augmentation.sql b/src/pg/sql/41_observatory_augmentation.sql
index 2fdf3ec..d810c54 100644
--- a/src/pg/sql/41_observatory_augmentation.sql
+++ b/src/pg/sql/41_observatory_augmentation.sql
@@ -172,6 +172,7 @@ BEGIN
      RAISE NOTICE 'Point % is outside of the data region', ST_AsText(geom);
       -- TODO this should return JSON
      RETURN QUERY SELECT '{}'::text[], '{}'::NUMERIC[];
+     RETURN;
   END IF;
 
   IF data_table_info IS NULL THEN
@@ -198,6 +199,7 @@ BEGIN
     SELECT unnest($1)
   $query$
   USING results;
+  RETURN;
 
 END;
 $$ LANGUAGE plpgsql;
@@ -398,7 +400,7 @@ BEGIN
 
   IF time_span IS NULL THEN
     -- TODO we should determine latest timespan for this measure
-    time_span := '2009 - 2013';
+    time_span := '2010 - 2014';
   END IF;
 
   EXECUTE '
@@ -668,7 +670,7 @@ target_cols := Array[
              array_agg(_OBS_GET->>'value') As vals
            FROM cdb_observatory._OBS_Get($1,
                         $2,
-                        '2009 - 2013',
+                        '2010 - 2014',
                         $3)
 
         ), percentiles As (
@@ -722,6 +724,7 @@ BEGIN
   THEN
      RAISE NOTICE 'Point % is outside of the data region', ST_AsText(geom);
      RETURN QUERY SELECT '{}'::text[], '{}'::text[];
+     RETURN;
   END IF;
 
   EXECUTE '
@@ -735,6 +738,7 @@ BEGIN
   THEN
     RAISE NOTICE 'No data table found for this location';
     RETURN QUERY SELECT NULL::json;
+    RETURN;
   END IF;
 
   EXECUTE
@@ -749,6 +753,7 @@ BEGIN
   THEN
     RAISE NOTICE 'No geometry id for this location';
     RETURN QUERY SELECT NULL::json;
+    RETURN;
   END IF;
 
   query := 'SELECT ARRAY[';