diff --git a/README.md b/README.md
index 796d254d..bfbce3a4 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,12 @@ GRANT USAGE ON SCHEMA blog TO monkey;
 * apply sql functions from `env/functions` directory
 * apply sql stored procedures from `env/stored_procs` directory
 
+### Redis ###
+
+* install redis with `apt-get install redis-server`
+* make sure that redis only listens on localhost
+* change redis.conf and set `maxmemory` (e.g: 500mb) and set `maxmemory-policy` to `allkeys-lru` 
+
 ### Install Bimg ###
 **Windows:**
 * install MSYS2
@@ -116,7 +122,7 @@ GRANT USAGE ON SCHEMA blog TO monkey;
 * modify `conf/nginx/nginx.conf` and replace `imagemonkey.io` and `api.imagemonkey.io` with your own domain names, copy it to `/etc/nginx/nginx.conf` and reload nginx with `service nginx reload`
 
 ### Build Application ###
-**Minimal** required Go version: v1.10.3
+**Minimal** required Go version: v1.11.10
 
 * install git with `apt-get install git`
 * install golang with `apt-get install golang`
@@ -138,9 +144,16 @@ mkdir -p /home/imagemonkey/unverified_donations
 ### Watchdog ###
 * install supervisor with `apt-get install supervisor`
 * add `imagemonkey` user to supervisor group with `adduser imagemonkey supervisor`
-* create logging directories with `mkdir -p /var/log/imagemonkey-api` and `mkdir -p /var/log/imagemonkey-web`
+* create logging directories with `mkdir -p /var/log/imagemonkey-api`, `mkdir -p /var/log/imagemonkey-web` `mkdir -p /var/log/imagemonkey-statworker`, `mkdir -p /var/log/imagemonkey-bot`, `mkdir -p /var/log/imagemonkey-blog-subscription-worker`, `mkdir -p /var/log/imagemonkey-data-processor`, `mkdir -p /var/log/imagemonkey-labelsdownloader`, `mkdir -p /var/log/imagemonkey-trending-labels-worker`
 * copy `conf/supervisor/imagemonkey-api.conf` to `/etc/supervisor/conf.d/imagemonkey-api.conf`
 * copy `conf/supervisor/imagemonkey-web.conf` to `/etc/supervisor/conf.d/imagemonkey-web.conf`
+* copy `conf/supervisor/imagemonkey-statworker.conf` to `/etc/supervisor/conf.d/imagemonkey-statworker.conf`
+* copy `conf/supervisor/imagemonkey-blog-subscription-worker.conf` to `/etc/supervisor/conf.d/imagemonkey-blog-subscription-worker.conf`
+* copy `conf/supervisor/imagemonkey-bot.conf` to `/etc/supervisor/conf.d/imagemonkey-bot.conf`
+* copy `conf/supervisor/imagemonkey-labels-downloader.conf` to `/etc/supervisor/conf.d/imagemonkey-labels-downloader.conf`
+* copy `conf/supervisor/imagemonkey-trending-labels-worker.conf` to `/etc/supervisor/conf.d/imagemonkey-trending-labels-worker.conf`
+* add `EnvironmentFile=/etc/environment` to the service section of the systemctl supervisor config file (see https://stackoverflow.com/questions/47083582/supervisor-not-using-etc-environment)
+* run `systemctl daemon-reload` and `systemctl restart supervisor`
 * run `supervisorctl reread && supervisorctl update && supervisorctl restart all`
 
 
diff --git a/env/docker/Dockerfile.blogsubscriptionworker b/env/docker/Dockerfile.blogsubscriptionworker
index 68bbb258..495a624c 100644
--- a/env/docker/Dockerfile.blogsubscriptionworker
+++ b/env/docker/Dockerfile.blogsubscriptionworker
@@ -1,4 +1,4 @@
-FROM golang:1.12.5-stretch
+FROM golang:1.12.14-buster
 
 ENV REDIS_ADDRESS=:6379
 ENV SENTRY_DSN=
diff --git a/env/docker/Dockerfile.bot b/env/docker/Dockerfile.bot
index 6caee6fe..209ede6c 100644
--- a/env/docker/Dockerfile.bot
+++ b/env/docker/Dockerfile.bot
@@ -1,4 +1,4 @@
-FROM golang:1.12.5-stretch
+FROM golang:1.12.14-buster
 
 RUN mkdir -p /home/go/bin
 ENV GOPATH=/home/go
diff --git a/env/docker/Dockerfile.buildbase b/env/docker/Dockerfile.buildbase
index d0b3a055..12888e88 100644
--- a/env/docker/Dockerfile.buildbase
+++ b/env/docker/Dockerfile.buildbase
@@ -1,4 +1,4 @@
-FROM golang:1.12.5-stretch
+FROM golang:1.12.14-buster
 
 ENV GOPATH=/home/go
 ENV GOBIN=/home/go/bin
diff --git a/env/docker/Dockerfile.dataprocessor b/env/docker/Dockerfile.dataprocessor
index ef34b6b3..8cca6540 100644
--- a/env/docker/Dockerfile.dataprocessor
+++ b/env/docker/Dockerfile.dataprocessor
@@ -1,4 +1,4 @@
-FROM golang:1.12.5-stretch
+FROM golang:1.12.14-buster
 
 ENV USE_SENTRY=true
 ARG SINGLESHOT=false
diff --git a/env/docker/Dockerfile.postgres b/env/docker/Dockerfile.postgres
index 17bb2b75..1ef71ca1 100644
--- a/env/docker/Dockerfile.postgres
+++ b/env/docker/Dockerfile.postgres
@@ -1,7 +1,7 @@
 FROM postgres:9.6.13
 
 ARG TEMPORAL_TABLE_VERSION=1.2.0
-ARG POSTGIS_VERSION=2.3
+ARG POSTGIS_VERSION=2.5
 ENV MONKEY_DB_PASSWORD=
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/env/docker/Dockerfile.statworker b/env/docker/Dockerfile.statworker
index 19faf31f..59f9dd7c 100644
--- a/env/docker/Dockerfile.statworker
+++ b/env/docker/Dockerfile.statworker
@@ -1,4 +1,4 @@
-FROM golang:1.12.5-stretch
+FROM golang:1.12.14-buster
 
 ENV SENTRY_DSN=
 ENV IMAGEMONKEY_DB_CONNECTION_STRING=
diff --git a/env/docker/Dockerfile.testing b/env/docker/Dockerfile.testing
index e71149a4..95836ee1 100644
--- a/env/docker/Dockerfile.testing
+++ b/env/docker/Dockerfile.testing
@@ -1,4 +1,7 @@
-FROM golang:1.12.5-stretch
+FROM golang:1.12.14-buster
+
+# when changing the base image, change also the debian version here
+ARG DEBIAN_VERSION=buster
 
 RUN mkdir -p /home/go/bin
 #ENV GOPATH=/home/go
@@ -26,7 +29,9 @@ COPY src/image /tmp/src/image
 COPY src/parser /tmp/src/parser
 COPY env/postgres /tmp/env/postgres
 
-RUN apt-get update \
+RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ ${DEBIAN_VERSION}-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
+    && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+	&& apt-get update \
 	&& apt-get install -y --no-install-recommends python3 postgresql-client-9.6 python3-pip wget unzip \
 	&& pip3 install selenium requests \
 	&& wget https://chromedriver.storage.googleapis.com/2.44/chromedriver_linux64.zip --directory-prefix=/tmp/ \
diff --git a/env/docker/Dockerfile.trendinglabelsworker b/env/docker/Dockerfile.trendinglabelsworker
index 4001bbad..a5151b38 100644
--- a/env/docker/Dockerfile.trendinglabelsworker
+++ b/env/docker/Dockerfile.trendinglabelsworker
@@ -1,4 +1,4 @@
-FROM golang:1.12.5-stretch
+FROM golang:1.12.14-buster
 
 ENV USE_SENTRY=true
 ENV SINGLESHOT=false
diff --git a/env/postgres/schema.sql b/env/postgres/schema.sql
index a1273c6c..d1ee3790 100644
--- a/env/postgres/schema.sql
+++ b/env/postgres/schema.sql
@@ -5,7 +5,7 @@
 -- Dumped from database version 9.6.12
 -- Dumped by pg_dump version 9.6.12
 
--- Started on 2019-10-05 19:07:02 CEST
+-- Started on 2019-12-05 20:42:24 CET
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -35,7 +35,7 @@ COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
 
 
 --
--- TOC entry 2 (class 3079 OID 5771417)
+-- TOC entry 2 (class 3079 OID 6928833)
 -- Name: postgis; Type: EXTENSION; Schema: -; Owner: 
 --
 
@@ -52,7 +52,7 @@ COMMENT ON EXTENSION postgis IS 'PostGIS geometry, geography, and raster spatial
 
 
 --
--- TOC entry 4 (class 3079 OID 5771403)
+-- TOC entry 4 (class 3079 OID 6928819)
 -- Name: temporal_tables; Type: EXTENSION; Schema: -; Owner: 
 --
 
@@ -69,7 +69,7 @@ COMMENT ON EXTENSION temporal_tables IS 'temporal tables';
 
 
 --
--- TOC entry 3 (class 3079 OID 5771406)
+-- TOC entry 3 (class 3079 OID 6928822)
 -- Name: uuid-ossp; Type: EXTENSION; Schema: -; Owner: 
 --
 
@@ -86,7 +86,7 @@ COMMENT ON EXTENSION "uuid-ossp" IS 'generate universally unique identifiers (UU
 
 
 --
--- TOC entry 1989 (class 1247 OID 5772918)
+-- TOC entry 1989 (class 1247 OID 6930334)
 -- Name: agg_areaweightedstats; Type: TYPE; Schema: public; Owner: postgres
 --
 
@@ -114,7 +114,7 @@ CREATE TYPE public.agg_areaweightedstats AS (
 ALTER TYPE public.agg_areaweightedstats OWNER TO postgres;
 
 --
--- TOC entry 1992 (class 1247 OID 5772921)
+-- TOC entry 1992 (class 1247 OID 6930337)
 -- Name: agg_areaweightedstatsstate; Type: TYPE; Schema: public; Owner: postgres
 --
 
@@ -137,7 +137,7 @@ CREATE TYPE public.agg_areaweightedstatsstate AS (
 ALTER TYPE public.agg_areaweightedstatsstate OWNER TO postgres;
 
 --
--- TOC entry 1995 (class 1247 OID 5772923)
+-- TOC entry 1995 (class 1247 OID 6930339)
 -- Name: control_type; Type: TYPE; Schema: public; Owner: postgres
 --
 
@@ -152,7 +152,7 @@ CREATE TYPE public.control_type AS ENUM (
 ALTER TYPE public.control_type OWNER TO postgres;
 
 --
--- TOC entry 1998 (class 1247 OID 5772933)
+-- TOC entry 1998 (class 1247 OID 6930349)
 -- Name: geomvaltxt; Type: TYPE; Schema: public; Owner: postgres
 --
 
@@ -166,7 +166,7 @@ CREATE TYPE public.geomvaltxt AS (
 ALTER TYPE public.geomvaltxt OWNER TO postgres;
 
 --
--- TOC entry 2001 (class 1247 OID 5772935)
+-- TOC entry 2001 (class 1247 OID 6930351)
 -- Name: label_bot_label_type; Type: TYPE; Schema: public; Owner: postgres
 --
 
@@ -179,7 +179,7 @@ CREATE TYPE public.label_bot_label_type AS ENUM (
 ALTER TYPE public.label_bot_label_type OWNER TO postgres;
 
 --
--- TOC entry 2004 (class 1247 OID 5772940)
+-- TOC entry 2004 (class 1247 OID 6930356)
 -- Name: label_bot_state_type; Type: TYPE; Schema: public; Owner: postgres
 --
 
@@ -201,7 +201,7 @@ CREATE TYPE public.label_bot_state_type AS ENUM (
 ALTER TYPE public.label_bot_state_type OWNER TO postgres;
 
 --
--- TOC entry 2007 (class 1247 OID 5772964)
+-- TOC entry 2007 (class 1247 OID 6930380)
 -- Name: label_type; Type: TYPE; Schema: public; Owner: postgres
 --
 
@@ -216,7 +216,7 @@ CREATE TYPE public.label_type AS ENUM (
 ALTER TYPE public.label_type OWNER TO postgres;
 
 --
--- TOC entry 2010 (class 1247 OID 5772974)
+-- TOC entry 2010 (class 1247 OID 6930390)
 -- Name: state_type; Type: TYPE; Schema: public; Owner: postgres
 --
 
@@ -230,7 +230,7 @@ CREATE TYPE public.state_type AS ENUM (
 ALTER TYPE public.state_type OWNER TO postgres;
 
 --
--- TOC entry 1512 (class 1255 OID 5772981)
+-- TOC entry 1512 (class 1255 OID 6930397)
 -- Name: _st_areaweightedsummarystats_finalfn(public.agg_areaweightedstatsstate); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -284,7 +284,7 @@ $_$;
 ALTER FUNCTION public._st_areaweightedsummarystats_finalfn(aws public.agg_areaweightedstatsstate) OWNER TO postgres;
 
 --
--- TOC entry 1513 (class 1255 OID 5772982)
+-- TOC entry 1513 (class 1255 OID 6930398)
 -- Name: _st_areaweightedsummarystats_statefn(public.agg_areaweightedstatsstate, public.geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -298,7 +298,7 @@ $_$;
 ALTER FUNCTION public._st_areaweightedsummarystats_statefn(aws public.agg_areaweightedstatsstate, geom public.geometry) OWNER TO postgres;
 
 --
--- TOC entry 1514 (class 1255 OID 5772983)
+-- TOC entry 1514 (class 1255 OID 6930399)
 -- Name: _st_areaweightedsummarystats_statefn(public.agg_areaweightedstatsstate, public.geomval); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -379,7 +379,7 @@ $_$;
 ALTER FUNCTION public._st_areaweightedsummarystats_statefn(aws public.agg_areaweightedstatsstate, gv public.geomval) OWNER TO postgres;
 
 --
--- TOC entry 1515 (class 1255 OID 5772984)
+-- TOC entry 1515 (class 1255 OID 6930400)
 -- Name: _st_areaweightedsummarystats_statefn(public.agg_areaweightedstatsstate, public.geometry, double precision); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -393,7 +393,7 @@ $_$;
 ALTER FUNCTION public._st_areaweightedsummarystats_statefn(aws public.agg_areaweightedstatsstate, geom public.geometry, val double precision) OWNER TO postgres;
 
 --
--- TOC entry 1516 (class 1255 OID 5772985)
+-- TOC entry 1516 (class 1255 OID 6930401)
 -- Name: _st_bufferedunion_finalfn(public.geomval); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -407,7 +407,7 @@ $_$;
 ALTER FUNCTION public._st_bufferedunion_finalfn(gv public.geomval) OWNER TO postgres;
 
 --
--- TOC entry 1518 (class 1255 OID 5772986)
+-- TOC entry 1518 (class 1255 OID 6930402)
 -- Name: _st_bufferedunion_statefn(public.geomval, public.geometry, double precision); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -434,7 +434,7 @@ $_$;
 ALTER FUNCTION public._st_bufferedunion_statefn(gv public.geomval, geom public.geometry, bufsize double precision) OWNER TO postgres;
 
 --
--- TOC entry 1519 (class 1255 OID 5772987)
+-- TOC entry 1519 (class 1255 OID 6930403)
 -- Name: _st_differenceagg_statefn(public.geometry, public.geometry, public.geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -498,7 +498,7 @@ $$;
 ALTER FUNCTION public._st_differenceagg_statefn(geom1 public.geometry, geom2 public.geometry, geom3 public.geometry) OWNER TO postgres;
 
 --
--- TOC entry 1520 (class 1255 OID 5772988)
+-- TOC entry 1520 (class 1255 OID 6930404)
 -- Name: _st_removeoverlaps_finalfn(public.geomvaltxt[]); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -518,7 +518,7 @@ $$;
 ALTER FUNCTION public._st_removeoverlaps_finalfn(gvtarray public.geomvaltxt[]) OWNER TO postgres;
 
 --
--- TOC entry 1521 (class 1255 OID 5772989)
+-- TOC entry 1521 (class 1255 OID 6930405)
 -- Name: _st_removeoverlaps_statefn(public.geomvaltxt[], public.geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -532,7 +532,7 @@ $_$;
 ALTER FUNCTION public._st_removeoverlaps_statefn(gvtarray public.geomvaltxt[], geom public.geometry) OWNER TO postgres;
 
 --
--- TOC entry 1522 (class 1255 OID 5772990)
+-- TOC entry 1522 (class 1255 OID 6930406)
 -- Name: _st_removeoverlaps_statefn(public.geomvaltxt[], public.geometry, double precision); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -546,7 +546,7 @@ $_$;
 ALTER FUNCTION public._st_removeoverlaps_statefn(gvtarray public.geomvaltxt[], geom public.geometry, val double precision) OWNER TO postgres;
 
 --
--- TOC entry 1523 (class 1255 OID 5772991)
+-- TOC entry 1523 (class 1255 OID 6930407)
 -- Name: _st_removeoverlaps_statefn(public.geomvaltxt[], public.geometry, text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -560,7 +560,7 @@ $_$;
 ALTER FUNCTION public._st_removeoverlaps_statefn(gvtarray public.geomvaltxt[], geom public.geometry, mergemethod text) OWNER TO postgres;
 
 --
--- TOC entry 1524 (class 1255 OID 5772992)
+-- TOC entry 1524 (class 1255 OID 6930408)
 -- Name: _st_removeoverlaps_statefn(public.geomvaltxt[], public.geometry, double precision, text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -581,7 +581,7 @@ $$;
 ALTER FUNCTION public._st_removeoverlaps_statefn(gvtarray public.geomvaltxt[], geom public.geometry, val double precision, mergemethod text) OWNER TO postgres;
 
 --
--- TOC entry 1525 (class 1255 OID 5772993)
+-- TOC entry 1525 (class 1255 OID 6930409)
 -- Name: _st_splitagg_statefn(public.geometry[], public.geometry, public.geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -595,7 +595,7 @@ $_$;
 ALTER FUNCTION public._st_splitagg_statefn(geomarray public.geometry[], geom1 public.geometry, geom2 public.geometry) OWNER TO postgres;
 
 --
--- TOC entry 1526 (class 1255 OID 5772994)
+-- TOC entry 1526 (class 1255 OID 6930410)
 -- Name: _st_splitagg_statefn(public.geometry[], public.geometry, public.geometry, double precision); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -646,7 +646,7 @@ $$;
 ALTER FUNCTION public._st_splitagg_statefn(geomarray public.geometry[], geom1 public.geometry, geom2 public.geometry, tolerance double precision) OWNER TO postgres;
 
 --
--- TOC entry 1527 (class 1255 OID 5772995)
+-- TOC entry 1527 (class 1255 OID 6930411)
 -- Name: ellipse(double precision, double precision, double precision, double precision, double precision); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -660,7 +660,7 @@ $$;
 ALTER FUNCTION public.ellipse(x double precision, y double precision, rx double precision, ry double precision, rotation double precision) OWNER TO postgres;
 
 --
--- TOC entry 1528 (class 1255 OID 5772996)
+-- TOC entry 1528 (class 1255 OID 6930412)
 -- Name: sp_get_image_annotation_coverage(text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -765,7 +765,7 @@ $_$;
 ALTER FUNCTION public.sp_get_image_annotation_coverage(imageid text) OWNER TO postgres;
 
 --
--- TOC entry 1529 (class 1255 OID 5772998)
+-- TOC entry 1529 (class 1255 OID 6930414)
 -- Name: st_adduniqueid(name, name, boolean, boolean); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -779,7 +779,7 @@ $_$;
 ALTER FUNCTION public.st_adduniqueid(tablename name, columnname name, replacecolumn boolean, indexit boolean) OWNER TO postgres;
 
 --
--- TOC entry 1531 (class 1255 OID 5772999)
+-- TOC entry 1531 (class 1255 OID 6930415)
 -- Name: st_adduniqueid(name, name, name, boolean, boolean); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -834,7 +834,7 @@ $$;
 ALTER FUNCTION public.st_adduniqueid(schemaname name, tablename name, columnname name, replacecolumn boolean, indexit boolean) OWNER TO postgres;
 
 --
--- TOC entry 1532 (class 1255 OID 5773000)
+-- TOC entry 1532 (class 1255 OID 6930416)
 -- Name: st_bufferedsmooth(public.geometry, double precision); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -848,7 +848,7 @@ $_$;
 ALTER FUNCTION public.st_bufferedsmooth(geom public.geometry, bufsize double precision) OWNER TO postgres;
 
 --
--- TOC entry 1533 (class 1255 OID 5773001)
+-- TOC entry 1533 (class 1255 OID 6930417)
 -- Name: st_columnexists(name, name); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -862,7 +862,7 @@ $_$;
 ALTER FUNCTION public.st_columnexists(tablename name, columnname name) OWNER TO postgres;
 
 --
--- TOC entry 1534 (class 1255 OID 5773002)
+-- TOC entry 1534 (class 1255 OID 6930418)
 -- Name: st_columnexists(name, name, name); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -881,7 +881,7 @@ $$;
 ALTER FUNCTION public.st_columnexists(schemaname name, tablename name, columnname name) OWNER TO postgres;
 
 --
--- TOC entry 1535 (class 1255 OID 5773003)
+-- TOC entry 1535 (class 1255 OID 6930419)
 -- Name: st_columnisunique(name, name); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -895,7 +895,7 @@ $_$;
 ALTER FUNCTION public.st_columnisunique(tablename name, columnname name) OWNER TO postgres;
 
 --
--- TOC entry 1536 (class 1255 OID 5773004)
+-- TOC entry 1536 (class 1255 OID 6930420)
 -- Name: st_columnisunique(name, name, name); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -934,7 +934,7 @@ $$;
 ALTER FUNCTION public.st_columnisunique(schemaname name, tablename name, columnname name) OWNER TO postgres;
 
 --
--- TOC entry 1537 (class 1255 OID 5773005)
+-- TOC entry 1537 (class 1255 OID 6930421)
 -- Name: st_createindexraster(public.raster, text, integer, boolean, boolean, boolean, boolean, integer, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -995,7 +995,7 @@ $$;
 ALTER FUNCTION public.st_createindexraster(rast public.raster, pixeltype text, startvalue integer, incwithx boolean, incwithy boolean, rowsfirst boolean, rowscanorder boolean, colinc integer, rowinc integer) OWNER TO postgres;
 
 --
--- TOC entry 1538 (class 1255 OID 5773006)
+-- TOC entry 1538 (class 1255 OID 6930422)
 -- Name: st_deleteband(public.raster, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1029,7 +1029,7 @@ $$;
 ALTER FUNCTION public.st_deleteband(rast public.raster, band integer) OWNER TO postgres;
 
 --
--- TOC entry 1539 (class 1255 OID 5773007)
+-- TOC entry 1539 (class 1255 OID 6930423)
 -- Name: st_extractpixelcentroidvalue4ma(double precision[], integer[], text[]); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1159,7 +1159,7 @@ $$;
 ALTER FUNCTION public.st_extractpixelcentroidvalue4ma(pixel double precision[], pos integer[], VARIADIC args text[]) OWNER TO postgres;
 
 --
--- TOC entry 1401 (class 1255 OID 5773008)
+-- TOC entry 1401 (class 1255 OID 6930424)
 -- Name: st_extractpixelvalue4ma(double precision[], integer[], text[]); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1388,7 +1388,7 @@ $$;
 ALTER FUNCTION public.st_extractpixelvalue4ma(pixel double precision[], pos integer[], VARIADIC args text[]) OWNER TO postgres;
 
 --
--- TOC entry 1471 (class 1255 OID 5773010)
+-- TOC entry 1471 (class 1255 OID 6930426)
 -- Name: st_extracttoraster(public.raster, name, name, name, text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1402,7 +1402,7 @@ $_$;
 ALTER FUNCTION public.st_extracttoraster(rast public.raster, schemaname name, tablename name, geomcolumnname name, method text) OWNER TO postgres;
 
 --
--- TOC entry 1491 (class 1255 OID 5773011)
+-- TOC entry 1491 (class 1255 OID 6930427)
 -- Name: st_extracttoraster(public.raster, integer, name, name, name, text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1416,7 +1416,7 @@ $_$;
 ALTER FUNCTION public.st_extracttoraster(rast public.raster, band integer, schemaname name, tablename name, geomcolumnname name, method text) OWNER TO postgres;
 
 --
--- TOC entry 1500 (class 1255 OID 5773012)
+-- TOC entry 1500 (class 1255 OID 6930428)
 -- Name: st_extracttoraster(public.raster, name, name, name, name, text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1430,7 +1430,7 @@ $_$;
 ALTER FUNCTION public.st_extracttoraster(rast public.raster, schemaname name, tablename name, geomcolumnname name, valuecolumnname name, method text) OWNER TO postgres;
 
 --
--- TOC entry 1540 (class 1255 OID 5773013)
+-- TOC entry 1540 (class 1255 OID 6930429)
 -- Name: st_extracttoraster(public.raster, integer, name, name, name, name, text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1505,7 +1505,7 @@ $_$;
 ALTER FUNCTION public.st_extracttoraster(rast public.raster, band integer, schemaname name, tablename name, geomrastcolumnname name, valuecolumnname name, method text) OWNER TO postgres;
 
 --
--- TOC entry 1541 (class 1255 OID 5773014)
+-- TOC entry 1541 (class 1255 OID 6930430)
 -- Name: st_geotablesummary(name, name, name, name, integer, text[], text[], text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2144,7 +2144,7 @@ $$;
 ALTER FUNCTION public.st_geotablesummary(schemaname name, tablename name, geomcolumnname name, uidcolumn name, nbinterval integer, dosummary text[], skipsummary text[], whereclause text) OWNER TO postgres;
 
 --
--- TOC entry 1542 (class 1255 OID 5773016)
+-- TOC entry 1542 (class 1255 OID 6930432)
 -- Name: st_geotablesummary(name, name, name, name, integer, text, text, text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2158,7 +2158,7 @@ $_$;
 ALTER FUNCTION public.st_geotablesummary(schemaname name, tablename name, geomcolumnname name, uidcolumn name, nbinterval integer, dosummary text, skipsummary text, whereclause text) OWNER TO postgres;
 
 --
--- TOC entry 1543 (class 1255 OID 5773017)
+-- TOC entry 1543 (class 1255 OID 6930433)
 -- Name: st_globalrasterunion(name, name, name, text, text, double precision); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2238,7 +2238,7 @@ $$;
 ALTER FUNCTION public.st_globalrasterunion(schemaname name, tablename name, rastercolumnname name, method text, pixeltype text, nodataval double precision) OWNER TO postgres;
 
 --
--- TOC entry 1544 (class 1255 OID 5773018)
+-- TOC entry 1544 (class 1255 OID 6930434)
 -- Name: st_hasbasicindex(name, name); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2252,7 +2252,7 @@ $_$;
 ALTER FUNCTION public.st_hasbasicindex(tablename name, columnname name) OWNER TO postgres;
 
 --
--- TOC entry 1545 (class 1255 OID 5773019)
+-- TOC entry 1545 (class 1255 OID 6930435)
 -- Name: st_hasbasicindex(name, name, text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2266,7 +2266,7 @@ $_$;
 ALTER FUNCTION public.st_hasbasicindex(tablename name, columnname name, idxstring text) OWNER TO postgres;
 
 --
--- TOC entry 1546 (class 1255 OID 5773020)
+-- TOC entry 1546 (class 1255 OID 6930436)
 -- Name: st_hasbasicindex(name, name, name, text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2352,7 +2352,7 @@ $$;
 ALTER FUNCTION public.st_hasbasicindex(schemaname name, tablename name, columnname name, idxstring text) OWNER TO postgres;
 
 --
--- TOC entry 1517 (class 1255 OID 5773021)
+-- TOC entry 1517 (class 1255 OID 6930437)
 -- Name: st_histogram(text, text, text, integer, text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2448,7 +2448,7 @@ $$;
 ALTER FUNCTION public.st_histogram(schemaname text, tablename text, columnname text, nbinterval integer, whereclause text) OWNER TO postgres;
 
 --
--- TOC entry 1547 (class 1255 OID 5773023)
+-- TOC entry 1547 (class 1255 OID 6930439)
 -- Name: st_nbiggestexteriorrings(public.geometry, integer, text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2478,7 +2478,7 @@ $$;
 ALTER FUNCTION public.st_nbiggestexteriorrings(ingeom public.geometry, nbrings integer, comptype text) OWNER TO postgres;
 
 --
--- TOC entry 1548 (class 1255 OID 5773024)
+-- TOC entry 1548 (class 1255 OID 6930440)
 -- Name: st_randompoints(public.geometry, integer, numeric); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2537,7 +2537,7 @@ $$;
 ALTER FUNCTION public.st_randompoints(geom public.geometry, nb integer, seed numeric) OWNER TO postgres;
 
 --
--- TOC entry 1549 (class 1255 OID 5773025)
+-- TOC entry 1549 (class 1255 OID 6930441)
 -- Name: st_removeoverlaps(public.geometry[]); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2554,7 +2554,7 @@ $$;
 ALTER FUNCTION public.st_removeoverlaps(geomarray public.geometry[]) OWNER TO postgres;
 
 --
--- TOC entry 1550 (class 1255 OID 5773026)
+-- TOC entry 1550 (class 1255 OID 6930442)
 -- Name: st_removeoverlaps(public.geomval[]); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2568,7 +2568,7 @@ $$;
 ALTER FUNCTION public.st_removeoverlaps(gvarray public.geomval[]) OWNER TO postgres;
 
 --
--- TOC entry 1551 (class 1255 OID 5773027)
+-- TOC entry 1551 (class 1255 OID 6930443)
 -- Name: st_removeoverlaps(public.geometry[], text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2585,7 +2585,7 @@ $$;
 ALTER FUNCTION public.st_removeoverlaps(geomarray public.geometry[], mergemethod text) OWNER TO postgres;
 
 --
--- TOC entry 1552 (class 1255 OID 5773028)
+-- TOC entry 1552 (class 1255 OID 6930444)
 -- Name: st_removeoverlaps(public.geomval[], text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2704,7 +2704,7 @@ $_$;
 ALTER FUNCTION public.st_removeoverlaps(gvarray public.geomval[], mergemethod text) OWNER TO postgres;
 
 --
--- TOC entry 1553 (class 1255 OID 5773029)
+-- TOC entry 1553 (class 1255 OID 6930445)
 -- Name: st_splitbygrid(public.geometry, double precision, double precision, double precision, double precision); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2767,7 +2767,7 @@ $$;
 ALTER FUNCTION public.st_splitbygrid(ingeom public.geometry, xgridsize double precision, ygridsize double precision, xgridoffset double precision, ygridoffset double precision) OWNER TO postgres;
 
 --
--- TOC entry 1530 (class 1255 OID 5773030)
+-- TOC entry 1530 (class 1255 OID 6930446)
 -- Name: st_trimmulti(public.geometry, double precision); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2784,7 +2784,7 @@ $_$;
 ALTER FUNCTION public.st_trimmulti(geom public.geometry, minarea double precision) OWNER TO postgres;
 
 --
--- TOC entry 1556 (class 1255 OID 5773031)
+-- TOC entry 1556 (class 1255 OID 6930447)
 -- Name: tables_empty(character varying); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2811,7 +2811,7 @@ CREATE FUNCTION public.tables_empty(username character varying) RETURNS boolean
 ALTER FUNCTION public.tables_empty(username character varying) OWNER TO postgres;
 
 --
--- TOC entry 1555 (class 1255 OID 5773032)
+-- TOC entry 1555 (class 1255 OID 6930448)
 -- Name: truncate_tables(character varying); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2833,7 +2833,7 @@ CREATE FUNCTION public.truncate_tables(username character varying) RETURNS void
 ALTER FUNCTION public.truncate_tables(username character varying) OWNER TO postgres;
 
 --
--- TOC entry 1554 (class 1255 OID 5773033)
+-- TOC entry 1554 (class 1255 OID 6930449)
 -- Name: update_array_elements(jsonb, text, jsonb); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2849,7 +2849,7 @@ $$;
 ALTER FUNCTION public.update_array_elements(arr jsonb, key text, value jsonb) OWNER TO postgres;
 
 --
--- TOC entry 2292 (class 1255 OID 5773034)
+-- TOC entry 2292 (class 1255 OID 6930450)
 -- Name: st_areaweightedsummarystats(public.geometry); Type: AGGREGATE; Schema: public; Owner: postgres
 --
 
@@ -2863,7 +2863,7 @@ CREATE AGGREGATE public.st_areaweightedsummarystats(public.geometry) (
 ALTER AGGREGATE public.st_areaweightedsummarystats(public.geometry) OWNER TO postgres;
 
 --
--- TOC entry 2293 (class 1255 OID 5773035)
+-- TOC entry 2293 (class 1255 OID 6930451)
 -- Name: st_areaweightedsummarystats(public.geomval); Type: AGGREGATE; Schema: public; Owner: postgres
 --
 
@@ -2877,7 +2877,7 @@ CREATE AGGREGATE public.st_areaweightedsummarystats(public.geomval) (
 ALTER AGGREGATE public.st_areaweightedsummarystats(public.geomval) OWNER TO postgres;
 
 --
--- TOC entry 2294 (class 1255 OID 5773036)
+-- TOC entry 2294 (class 1255 OID 6930452)
 -- Name: st_areaweightedsummarystats(public.geometry, double precision); Type: AGGREGATE; Schema: public; Owner: postgres
 --
 
@@ -2891,7 +2891,7 @@ CREATE AGGREGATE public.st_areaweightedsummarystats(public.geometry, double prec
 ALTER AGGREGATE public.st_areaweightedsummarystats(public.geometry, double precision) OWNER TO postgres;
 
 --
--- TOC entry 2295 (class 1255 OID 5773037)
+-- TOC entry 2295 (class 1255 OID 6930453)
 -- Name: st_bufferedunion(public.geometry, double precision); Type: AGGREGATE; Schema: public; Owner: postgres
 --
 
@@ -2905,7 +2905,7 @@ CREATE AGGREGATE public.st_bufferedunion(public.geometry, double precision) (
 ALTER AGGREGATE public.st_bufferedunion(public.geometry, double precision) OWNER TO postgres;
 
 --
--- TOC entry 2296 (class 1255 OID 5773038)
+-- TOC entry 2296 (class 1255 OID 6930454)
 -- Name: st_differenceagg(public.geometry, public.geometry); Type: AGGREGATE; Schema: public; Owner: postgres
 --
 
@@ -2918,7 +2918,7 @@ CREATE AGGREGATE public.st_differenceagg(public.geometry, public.geometry) (
 ALTER AGGREGATE public.st_differenceagg(public.geometry, public.geometry) OWNER TO postgres;
 
 --
--- TOC entry 2297 (class 1255 OID 5773039)
+-- TOC entry 2297 (class 1255 OID 6930455)
 -- Name: st_removeoverlaps(public.geometry); Type: AGGREGATE; Schema: public; Owner: postgres
 --
 
@@ -2932,7 +2932,7 @@ CREATE AGGREGATE public.st_removeoverlaps(public.geometry) (
 ALTER AGGREGATE public.st_removeoverlaps(public.geometry) OWNER TO postgres;
 
 --
--- TOC entry 2298 (class 1255 OID 5773040)
+-- TOC entry 2298 (class 1255 OID 6930456)
 -- Name: st_removeoverlaps(public.geometry, double precision); Type: AGGREGATE; Schema: public; Owner: postgres
 --
 
@@ -2946,7 +2946,7 @@ CREATE AGGREGATE public.st_removeoverlaps(public.geometry, double precision) (
 ALTER AGGREGATE public.st_removeoverlaps(public.geometry, double precision) OWNER TO postgres;
 
 --
--- TOC entry 2299 (class 1255 OID 5773041)
+-- TOC entry 2299 (class 1255 OID 6930457)
 -- Name: st_removeoverlaps(public.geometry, text); Type: AGGREGATE; Schema: public; Owner: postgres
 --
 
@@ -2960,7 +2960,7 @@ CREATE AGGREGATE public.st_removeoverlaps(public.geometry, text) (
 ALTER AGGREGATE public.st_removeoverlaps(public.geometry, text) OWNER TO postgres;
 
 --
--- TOC entry 2300 (class 1255 OID 5773042)
+-- TOC entry 2300 (class 1255 OID 6930458)
 -- Name: st_removeoverlaps(public.geometry, double precision, text); Type: AGGREGATE; Schema: public; Owner: postgres
 --
 
@@ -2974,7 +2974,7 @@ CREATE AGGREGATE public.st_removeoverlaps(public.geometry, double precision, tex
 ALTER AGGREGATE public.st_removeoverlaps(public.geometry, double precision, text) OWNER TO postgres;
 
 --
--- TOC entry 2301 (class 1255 OID 5773043)
+-- TOC entry 2301 (class 1255 OID 6930459)
 -- Name: st_splitagg(public.geometry, public.geometry); Type: AGGREGATE; Schema: public; Owner: postgres
 --
 
@@ -2987,7 +2987,7 @@ CREATE AGGREGATE public.st_splitagg(public.geometry, public.geometry) (
 ALTER AGGREGATE public.st_splitagg(public.geometry, public.geometry) OWNER TO postgres;
 
 --
--- TOC entry 2302 (class 1255 OID 5773044)
+-- TOC entry 2302 (class 1255 OID 6930460)
 -- Name: st_splitagg(public.geometry, public.geometry, double precision); Type: AGGREGATE; Schema: public; Owner: postgres
 --
 
@@ -3000,7 +3000,7 @@ CREATE AGGREGATE public.st_splitagg(public.geometry, public.geometry, double pre
 ALTER AGGREGATE public.st_splitagg(public.geometry, public.geometry, double precision) OWNER TO postgres;
 
 --
--- TOC entry 206 (class 1259 OID 5773045)
+-- TOC entry 206 (class 1259 OID 6930461)
 -- Name: access_token_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3019,7 +3019,7 @@ SET default_tablespace = '';
 SET default_with_oids = false;
 
 --
--- TOC entry 207 (class 1259 OID 5773047)
+-- TOC entry 207 (class 1259 OID 6930463)
 -- Name: access_token; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3034,7 +3034,7 @@ CREATE TABLE public.access_token (
 ALTER TABLE public.access_token OWNER TO monkey;
 
 --
--- TOC entry 208 (class 1259 OID 5773054)
+-- TOC entry 208 (class 1259 OID 6930470)
 -- Name: account_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3049,7 +3049,7 @@ CREATE SEQUENCE public.account_id_seq
 ALTER TABLE public.account_id_seq OWNER TO monkey;
 
 --
--- TOC entry 209 (class 1259 OID 5773056)
+-- TOC entry 209 (class 1259 OID 6930472)
 -- Name: account; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3067,7 +3067,7 @@ CREATE TABLE public.account (
 ALTER TABLE public.account OWNER TO monkey;
 
 --
--- TOC entry 210 (class 1259 OID 5773063)
+-- TOC entry 210 (class 1259 OID 6930479)
 -- Name: account_permission_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3082,7 +3082,7 @@ CREATE SEQUENCE public.account_permission_id_seq
 ALTER TABLE public.account_permission_id_seq OWNER TO monkey;
 
 --
--- TOC entry 211 (class 1259 OID 5773065)
+-- TOC entry 211 (class 1259 OID 6930481)
 -- Name: account_permission; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3100,7 +3100,7 @@ CREATE TABLE public.account_permission (
 ALTER TABLE public.account_permission OWNER TO monkey;
 
 --
--- TOC entry 212 (class 1259 OID 5773069)
+-- TOC entry 212 (class 1259 OID 6930485)
 -- Name: image_annotation_data_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3115,7 +3115,7 @@ CREATE SEQUENCE public.image_annotation_data_id_seq
 ALTER TABLE public.image_annotation_data_id_seq OWNER TO monkey;
 
 --
--- TOC entry 213 (class 1259 OID 5773071)
+-- TOC entry 213 (class 1259 OID 6930487)
 -- Name: annotation_data; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3132,7 +3132,7 @@ CREATE TABLE public.annotation_data (
 ALTER TABLE public.annotation_data OWNER TO monkey;
 
 --
--- TOC entry 214 (class 1259 OID 5773078)
+-- TOC entry 214 (class 1259 OID 6930494)
 -- Name: annotation_refinements_per_country_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3147,7 +3147,7 @@ CREATE SEQUENCE public.annotation_refinements_per_country_id_seq
 ALTER TABLE public.annotation_refinements_per_country_id_seq OWNER TO monkey;
 
 --
--- TOC entry 215 (class 1259 OID 5773080)
+-- TOC entry 215 (class 1259 OID 6930496)
 -- Name: annotation_refinements_per_country; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3161,7 +3161,7 @@ CREATE TABLE public.annotation_refinements_per_country (
 ALTER TABLE public.annotation_refinements_per_country OWNER TO monkey;
 
 --
--- TOC entry 301 (class 1259 OID 5774214)
+-- TOC entry 216 (class 1259 OID 6930503)
 -- Name: image_annotation_suggestion_data_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3176,7 +3176,7 @@ CREATE SEQUENCE public.image_annotation_suggestion_data_id_seq
 ALTER TABLE public.image_annotation_suggestion_data_id_seq OWNER TO monkey;
 
 --
--- TOC entry 302 (class 1259 OID 5774243)
+-- TOC entry 217 (class 1259 OID 6930505)
 -- Name: annotation_suggestion_data; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3193,7 +3193,7 @@ CREATE TABLE public.annotation_suggestion_data (
 ALTER TABLE public.annotation_suggestion_data OWNER TO monkey;
 
 --
--- TOC entry 216 (class 1259 OID 5773087)
+-- TOC entry 218 (class 1259 OID 6930512)
 -- Name: annotation_type; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3206,7 +3206,7 @@ CREATE TABLE public.annotation_type (
 ALTER TABLE public.annotation_type OWNER TO monkey;
 
 --
--- TOC entry 217 (class 1259 OID 5773093)
+-- TOC entry 219 (class 1259 OID 6930518)
 -- Name: annotations_per_app_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3221,7 +3221,7 @@ CREATE SEQUENCE public.annotations_per_app_id_seq
 ALTER TABLE public.annotations_per_app_id_seq OWNER TO monkey;
 
 --
--- TOC entry 218 (class 1259 OID 5773095)
+-- TOC entry 220 (class 1259 OID 6930520)
 -- Name: annotations_per_app; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3235,7 +3235,7 @@ CREATE TABLE public.annotations_per_app (
 ALTER TABLE public.annotations_per_app OWNER TO monkey;
 
 --
--- TOC entry 219 (class 1259 OID 5773102)
+-- TOC entry 221 (class 1259 OID 6930527)
 -- Name: annotations_per_country_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3250,7 +3250,7 @@ CREATE SEQUENCE public.annotations_per_country_id_seq
 ALTER TABLE public.annotations_per_country_id_seq OWNER TO monkey;
 
 --
--- TOC entry 220 (class 1259 OID 5773104)
+-- TOC entry 222 (class 1259 OID 6930529)
 -- Name: annotations_per_country; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3264,7 +3264,7 @@ CREATE TABLE public.annotations_per_country (
 ALTER TABLE public.annotations_per_country OWNER TO monkey;
 
 --
--- TOC entry 221 (class 1259 OID 5773111)
+-- TOC entry 223 (class 1259 OID 6930536)
 -- Name: api_token_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3279,7 +3279,7 @@ CREATE SEQUENCE public.api_token_id_seq
 ALTER TABLE public.api_token_id_seq OWNER TO monkey;
 
 --
--- TOC entry 222 (class 1259 OID 5773113)
+-- TOC entry 224 (class 1259 OID 6930538)
 -- Name: api_token; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3297,7 +3297,7 @@ CREATE TABLE public.api_token (
 ALTER TABLE public.api_token OWNER TO monkey;
 
 --
--- TOC entry 223 (class 1259 OID 5773120)
+-- TOC entry 225 (class 1259 OID 6930545)
 -- Name: donations_per_app_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3312,7 +3312,7 @@ CREATE SEQUENCE public.donations_per_app_id_seq
 ALTER TABLE public.donations_per_app_id_seq OWNER TO monkey;
 
 --
--- TOC entry 224 (class 1259 OID 5773122)
+-- TOC entry 226 (class 1259 OID 6930547)
 -- Name: donations_per_app; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3326,7 +3326,7 @@ CREATE TABLE public.donations_per_app (
 ALTER TABLE public.donations_per_app OWNER TO monkey;
 
 --
--- TOC entry 225 (class 1259 OID 5773129)
+-- TOC entry 227 (class 1259 OID 6930554)
 -- Name: donations_per_country_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3341,7 +3341,7 @@ CREATE SEQUENCE public.donations_per_country_id_seq
 ALTER TABLE public.donations_per_country_id_seq OWNER TO monkey;
 
 --
--- TOC entry 226 (class 1259 OID 5773131)
+-- TOC entry 228 (class 1259 OID 6930556)
 -- Name: donations_per_country; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3355,7 +3355,7 @@ CREATE TABLE public.donations_per_country (
 ALTER TABLE public.donations_per_country OWNER TO monkey;
 
 --
--- TOC entry 227 (class 1259 OID 5773138)
+-- TOC entry 229 (class 1259 OID 6930563)
 -- Name: image; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3374,7 +3374,7 @@ CREATE TABLE public.image (
 ALTER TABLE public.image OWNER TO monkey;
 
 --
--- TOC entry 228 (class 1259 OID 5773144)
+-- TOC entry 230 (class 1259 OID 6930569)
 -- Name: image_annotation_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3389,7 +3389,7 @@ CREATE SEQUENCE public.image_annotation_id_seq
 ALTER TABLE public.image_annotation_id_seq OWNER TO monkey;
 
 --
--- TOC entry 229 (class 1259 OID 5773146)
+-- TOC entry 231 (class 1259 OID 6930571)
 -- Name: image_annotation; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3410,7 +3410,7 @@ CREATE TABLE public.image_annotation (
 ALTER TABLE public.image_annotation OWNER TO monkey;
 
 --
--- TOC entry 230 (class 1259 OID 5773154)
+-- TOC entry 232 (class 1259 OID 6930579)
 -- Name: image_annotation_coverage_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3425,7 +3425,7 @@ CREATE SEQUENCE public.image_annotation_coverage_id_seq
 ALTER TABLE public.image_annotation_coverage_id_seq OWNER TO monkey;
 
 --
--- TOC entry 231 (class 1259 OID 5773156)
+-- TOC entry 233 (class 1259 OID 6930581)
 -- Name: image_annotation_coverage; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3440,7 +3440,7 @@ CREATE TABLE public.image_annotation_coverage (
 ALTER TABLE public.image_annotation_coverage OWNER TO monkey;
 
 --
--- TOC entry 232 (class 1259 OID 5773160)
+-- TOC entry 234 (class 1259 OID 6930585)
 -- Name: image_annotation_history; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3460,7 +3460,7 @@ CREATE TABLE public.image_annotation_history (
 ALTER TABLE public.image_annotation_history OWNER TO monkey;
 
 --
--- TOC entry 233 (class 1259 OID 5773167)
+-- TOC entry 235 (class 1259 OID 6930592)
 -- Name: image_annotation_refinement_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3475,7 +3475,7 @@ CREATE SEQUENCE public.image_annotation_refinement_id_seq
 ALTER TABLE public.image_annotation_refinement_id_seq OWNER TO monkey;
 
 --
--- TOC entry 234 (class 1259 OID 5773169)
+-- TOC entry 236 (class 1259 OID 6930594)
 -- Name: image_annotation_refinement; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3492,7 +3492,7 @@ CREATE TABLE public.image_annotation_refinement (
 ALTER TABLE public.image_annotation_refinement OWNER TO monkey;
 
 --
--- TOC entry 235 (class 1259 OID 5773177)
+-- TOC entry 237 (class 1259 OID 6930602)
 -- Name: image_annotation_refinement_history; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3509,7 +3509,7 @@ CREATE TABLE public.image_annotation_refinement_history (
 ALTER TABLE public.image_annotation_refinement_history OWNER TO monkey;
 
 --
--- TOC entry 236 (class 1259 OID 5773183)
+-- TOC entry 238 (class 1259 OID 6930608)
 -- Name: image_annotation_revision_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3524,7 +3524,7 @@ CREATE SEQUENCE public.image_annotation_revision_id_seq
 ALTER TABLE public.image_annotation_revision_id_seq OWNER TO monkey;
 
 --
--- TOC entry 237 (class 1259 OID 5773185)
+-- TOC entry 239 (class 1259 OID 6930610)
 -- Name: image_annotation_revision; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3538,7 +3538,7 @@ CREATE TABLE public.image_annotation_revision (
 ALTER TABLE public.image_annotation_revision OWNER TO monkey;
 
 --
--- TOC entry 296 (class 1259 OID 5774162)
+-- TOC entry 240 (class 1259 OID 6930614)
 -- Name: image_annotation_suggestion_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3553,7 +3553,7 @@ CREATE SEQUENCE public.image_annotation_suggestion_id_seq
 ALTER TABLE public.image_annotation_suggestion_id_seq OWNER TO monkey;
 
 --
--- TOC entry 297 (class 1259 OID 5774164)
+-- TOC entry 241 (class 1259 OID 6930616)
 -- Name: image_annotation_suggestion; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3574,7 +3574,7 @@ CREATE TABLE public.image_annotation_suggestion (
 ALTER TABLE public.image_annotation_suggestion OWNER TO monkey;
 
 --
--- TOC entry 298 (class 1259 OID 5774190)
+-- TOC entry 242 (class 1259 OID 6930624)
 -- Name: image_annotation_suggestion_history; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3594,7 +3594,7 @@ CREATE TABLE public.image_annotation_suggestion_history (
 ALTER TABLE public.image_annotation_suggestion_history OWNER TO monkey;
 
 --
--- TOC entry 305 (class 1259 OID 5774296)
+-- TOC entry 243 (class 1259 OID 6930630)
 -- Name: image_annotation_suggestion_refinement_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3609,7 +3609,7 @@ CREATE SEQUENCE public.image_annotation_suggestion_refinement_id_seq
 ALTER TABLE public.image_annotation_suggestion_refinement_id_seq OWNER TO monkey;
 
 --
--- TOC entry 306 (class 1259 OID 5774468)
+-- TOC entry 244 (class 1259 OID 6930632)
 -- Name: image_annotation_suggestion_refinement; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3626,7 +3626,7 @@ CREATE TABLE public.image_annotation_suggestion_refinement (
 ALTER TABLE public.image_annotation_suggestion_refinement OWNER TO monkey;
 
 --
--- TOC entry 307 (class 1259 OID 5774492)
+-- TOC entry 245 (class 1259 OID 6930640)
 -- Name: image_annotation_suggestion_refinement_history; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3643,7 +3643,7 @@ CREATE TABLE public.image_annotation_suggestion_refinement_history (
 ALTER TABLE public.image_annotation_suggestion_refinement_history OWNER TO monkey;
 
 --
--- TOC entry 299 (class 1259 OID 5774197)
+-- TOC entry 246 (class 1259 OID 6930646)
 -- Name: image_annotation_suggestion_revision_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3658,7 +3658,7 @@ CREATE SEQUENCE public.image_annotation_suggestion_revision_id_seq
 ALTER TABLE public.image_annotation_suggestion_revision_id_seq OWNER TO monkey;
 
 --
--- TOC entry 300 (class 1259 OID 5774199)
+-- TOC entry 247 (class 1259 OID 6930648)
 -- Name: image_annotation_suggestion_revision; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3672,7 +3672,7 @@ CREATE TABLE public.image_annotation_suggestion_revision (
 ALTER TABLE public.image_annotation_suggestion_revision OWNER TO monkey;
 
 --
--- TOC entry 238 (class 1259 OID 5773189)
+-- TOC entry 248 (class 1259 OID 6930652)
 -- Name: image_classification_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3687,7 +3687,7 @@ CREATE SEQUENCE public.image_classification_id_seq
 ALTER TABLE public.image_classification_id_seq OWNER TO monkey;
 
 --
--- TOC entry 239 (class 1259 OID 5773191)
+-- TOC entry 249 (class 1259 OID 6930654)
 -- Name: image_collection_image_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3702,21 +3702,22 @@ CREATE SEQUENCE public.image_collection_image_id_seq
 ALTER TABLE public.image_collection_image_id_seq OWNER TO monkey;
 
 --
--- TOC entry 240 (class 1259 OID 5773193)
+-- TOC entry 250 (class 1259 OID 6930656)
 -- Name: image_collection_image; Type: TABLE; Schema: public; Owner: monkey
 --
 
 CREATE TABLE public.image_collection_image (
     id bigint DEFAULT nextval('public.image_collection_image_id_seq'::regclass) NOT NULL,
     image_id bigint NOT NULL,
-    user_image_collection_id bigint NOT NULL
+    user_image_collection_id bigint NOT NULL,
+    last_modified bigint
 );
 
 
 ALTER TABLE public.image_collection_image OWNER TO monkey;
 
 --
--- TOC entry 241 (class 1259 OID 5773197)
+-- TOC entry 251 (class 1259 OID 6930660)
 -- Name: image_description_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3731,7 +3732,7 @@ CREATE SEQUENCE public.image_description_id_seq
 ALTER TABLE public.image_description_id_seq OWNER TO monkey;
 
 --
--- TOC entry 242 (class 1259 OID 5773199)
+-- TOC entry 252 (class 1259 OID 6930662)
 -- Name: image_description; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3752,7 +3753,7 @@ CREATE TABLE public.image_description (
 ALTER TABLE public.image_description OWNER TO monkey;
 
 --
--- TOC entry 243 (class 1259 OID 5773206)
+-- TOC entry 253 (class 1259 OID 6930669)
 -- Name: image_description_history; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3773,7 +3774,7 @@ CREATE TABLE public.image_description_history (
 ALTER TABLE public.image_description_history OWNER TO monkey;
 
 --
--- TOC entry 244 (class 1259 OID 5773212)
+-- TOC entry 254 (class 1259 OID 6930675)
 -- Name: image_descriptions_per_country_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3788,7 +3789,7 @@ CREATE SEQUENCE public.image_descriptions_per_country_id_seq
 ALTER TABLE public.image_descriptions_per_country_id_seq OWNER TO monkey;
 
 --
--- TOC entry 245 (class 1259 OID 5773214)
+-- TOC entry 255 (class 1259 OID 6930677)
 -- Name: image_descriptions_per_country; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3802,7 +3803,7 @@ CREATE TABLE public.image_descriptions_per_country (
 ALTER TABLE public.image_descriptions_per_country OWNER TO monkey;
 
 --
--- TOC entry 246 (class 1259 OID 5773221)
+-- TOC entry 256 (class 1259 OID 6930684)
 -- Name: image_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3818,7 +3819,7 @@ ALTER TABLE public.image_id_seq OWNER TO monkey;
 
 --
 -- TOC entry 4397 (class 0 OID 0)
--- Dependencies: 246
+-- Dependencies: 256
 -- Name: image_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: monkey
 --
 
@@ -3826,7 +3827,7 @@ ALTER SEQUENCE public.image_id_seq OWNED BY public.image.id;
 
 
 --
--- TOC entry 247 (class 1259 OID 5773223)
+-- TOC entry 257 (class 1259 OID 6930686)
 -- Name: image_label_suggestion_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3841,7 +3842,7 @@ CREATE SEQUENCE public.image_label_suggestion_id_seq
 ALTER TABLE public.image_label_suggestion_id_seq OWNER TO monkey;
 
 --
--- TOC entry 248 (class 1259 OID 5773225)
+-- TOC entry 258 (class 1259 OID 6930688)
 -- Name: image_label_suggestion; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3859,7 +3860,7 @@ CREATE TABLE public.image_label_suggestion (
 ALTER TABLE public.image_label_suggestion OWNER TO monkey;
 
 --
--- TOC entry 249 (class 1259 OID 5773232)
+-- TOC entry 259 (class 1259 OID 6930695)
 -- Name: image_provider_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3874,7 +3875,7 @@ CREATE SEQUENCE public.image_provider_id_seq
 ALTER TABLE public.image_provider_id_seq OWNER TO monkey;
 
 --
--- TOC entry 250 (class 1259 OID 5773234)
+-- TOC entry 260 (class 1259 OID 6930697)
 -- Name: image_provider; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3887,7 +3888,7 @@ CREATE TABLE public.image_provider (
 ALTER TABLE public.image_provider OWNER TO monkey;
 
 --
--- TOC entry 251 (class 1259 OID 5773241)
+-- TOC entry 261 (class 1259 OID 6930704)
 -- Name: image_quarantine_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3902,7 +3903,7 @@ CREATE SEQUENCE public.image_quarantine_id_seq
 ALTER TABLE public.image_quarantine_id_seq OWNER TO monkey;
 
 --
--- TOC entry 252 (class 1259 OID 5773243)
+-- TOC entry 262 (class 1259 OID 6930706)
 -- Name: image_quarantine; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3915,7 +3916,7 @@ CREATE TABLE public.image_quarantine (
 ALTER TABLE public.image_quarantine OWNER TO monkey;
 
 --
--- TOC entry 253 (class 1259 OID 5773247)
+-- TOC entry 263 (class 1259 OID 6930710)
 -- Name: report_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3930,7 +3931,7 @@ CREATE SEQUENCE public.report_id_seq
 ALTER TABLE public.report_id_seq OWNER TO monkey;
 
 --
--- TOC entry 254 (class 1259 OID 5773249)
+-- TOC entry 264 (class 1259 OID 6930712)
 -- Name: image_report; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3944,7 +3945,7 @@ CREATE TABLE public.image_report (
 ALTER TABLE public.image_report OWNER TO monkey;
 
 --
--- TOC entry 255 (class 1259 OID 5773256)
+-- TOC entry 265 (class 1259 OID 6930719)
 -- Name: image_source_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3959,7 +3960,7 @@ CREATE SEQUENCE public.image_source_id_seq
 ALTER TABLE public.image_source_id_seq OWNER TO monkey;
 
 --
--- TOC entry 256 (class 1259 OID 5773258)
+-- TOC entry 266 (class 1259 OID 6930721)
 -- Name: image_source; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -3973,7 +3974,7 @@ CREATE TABLE public.image_source (
 ALTER TABLE public.image_source OWNER TO monkey;
 
 --
--- TOC entry 257 (class 1259 OID 5773265)
+-- TOC entry 267 (class 1259 OID 6930728)
 -- Name: image_validation_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -3988,7 +3989,7 @@ CREATE SEQUENCE public.image_validation_id_seq
 ALTER TABLE public.image_validation_id_seq OWNER TO monkey;
 
 --
--- TOC entry 258 (class 1259 OID 5773267)
+-- TOC entry 268 (class 1259 OID 6930730)
 -- Name: image_validation; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4008,7 +4009,7 @@ CREATE TABLE public.image_validation (
 ALTER TABLE public.image_validation OWNER TO monkey;
 
 --
--- TOC entry 259 (class 1259 OID 5773275)
+-- TOC entry 269 (class 1259 OID 6930738)
 -- Name: image_validation_history; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4028,7 +4029,7 @@ CREATE TABLE public.image_validation_history (
 ALTER TABLE public.image_validation_history OWNER TO monkey;
 
 --
--- TOC entry 260 (class 1259 OID 5773281)
+-- TOC entry 270 (class 1259 OID 6930744)
 -- Name: image_validation_source_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4043,7 +4044,7 @@ CREATE SEQUENCE public.image_validation_source_id_seq
 ALTER TABLE public.image_validation_source_id_seq OWNER TO monkey;
 
 --
--- TOC entry 261 (class 1259 OID 5773283)
+-- TOC entry 271 (class 1259 OID 6930746)
 -- Name: image_validation_source; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4057,7 +4058,7 @@ CREATE TABLE public.image_validation_source (
 ALTER TABLE public.image_validation_source OWNER TO monkey;
 
 --
--- TOC entry 262 (class 1259 OID 5773287)
+-- TOC entry 272 (class 1259 OID 6930750)
 -- Name: imagehunt_task_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4072,7 +4073,7 @@ CREATE SEQUENCE public.imagehunt_task_id_seq
 ALTER TABLE public.imagehunt_task_id_seq OWNER TO monkey;
 
 --
--- TOC entry 263 (class 1259 OID 5773289)
+-- TOC entry 273 (class 1259 OID 6930752)
 -- Name: imagehunt_task; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4086,7 +4087,7 @@ CREATE TABLE public.imagehunt_task (
 ALTER TABLE public.imagehunt_task OWNER TO monkey;
 
 --
--- TOC entry 264 (class 1259 OID 5773293)
+-- TOC entry 274 (class 1259 OID 6930756)
 -- Name: name_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4101,7 +4102,7 @@ CREATE SEQUENCE public.name_id_seq
 ALTER TABLE public.name_id_seq OWNER TO monkey;
 
 --
--- TOC entry 265 (class 1259 OID 5773295)
+-- TOC entry 275 (class 1259 OID 6930758)
 -- Name: label; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4117,7 +4118,7 @@ CREATE TABLE public.label (
 ALTER TABLE public.label OWNER TO monkey;
 
 --
--- TOC entry 266 (class 1259 OID 5773302)
+-- TOC entry 276 (class 1259 OID 6930765)
 -- Name: label_accessor_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4132,7 +4133,7 @@ CREATE SEQUENCE public.label_accessor_id_seq
 ALTER TABLE public.label_accessor_id_seq OWNER TO monkey;
 
 --
--- TOC entry 267 (class 1259 OID 5773304)
+-- TOC entry 277 (class 1259 OID 6930767)
 -- Name: label_accessor; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4146,7 +4147,7 @@ CREATE TABLE public.label_accessor (
 ALTER TABLE public.label_accessor OWNER TO monkey;
 
 --
--- TOC entry 268 (class 1259 OID 5773311)
+-- TOC entry 278 (class 1259 OID 6930774)
 -- Name: label_example_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4161,7 +4162,7 @@ CREATE SEQUENCE public.label_example_id_seq
 ALTER TABLE public.label_example_id_seq OWNER TO monkey;
 
 --
--- TOC entry 269 (class 1259 OID 5773313)
+-- TOC entry 279 (class 1259 OID 6930776)
 -- Name: label_example; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4176,7 +4177,7 @@ CREATE TABLE public.label_example (
 ALTER TABLE public.label_example OWNER TO monkey;
 
 --
--- TOC entry 270 (class 1259 OID 5773320)
+-- TOC entry 280 (class 1259 OID 6930783)
 -- Name: label_suggestion_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4191,7 +4192,7 @@ CREATE SEQUENCE public.label_suggestion_id_seq
 ALTER TABLE public.label_suggestion_id_seq OWNER TO monkey;
 
 --
--- TOC entry 271 (class 1259 OID 5773322)
+-- TOC entry 281 (class 1259 OID 6930785)
 -- Name: label_suggestion; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4206,7 +4207,7 @@ CREATE TABLE public.label_suggestion (
 ALTER TABLE public.label_suggestion OWNER TO monkey;
 
 --
--- TOC entry 272 (class 1259 OID 5773329)
+-- TOC entry 282 (class 1259 OID 6930792)
 -- Name: language_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4221,7 +4222,7 @@ CREATE SEQUENCE public.language_id_seq
 ALTER TABLE public.language_id_seq OWNER TO monkey;
 
 --
--- TOC entry 273 (class 1259 OID 5773331)
+-- TOC entry 283 (class 1259 OID 6930794)
 -- Name: language; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4235,7 +4236,7 @@ CREATE TABLE public.language (
 ALTER TABLE public.language OWNER TO monkey;
 
 --
--- TOC entry 274 (class 1259 OID 5773338)
+-- TOC entry 284 (class 1259 OID 6930801)
 -- Name: quiz_answer_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4250,7 +4251,7 @@ CREATE SEQUENCE public.quiz_answer_id_seq
 ALTER TABLE public.quiz_answer_id_seq OWNER TO monkey;
 
 --
--- TOC entry 275 (class 1259 OID 5773340)
+-- TOC entry 285 (class 1259 OID 6930803)
 -- Name: quiz_answer; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4264,7 +4265,7 @@ CREATE TABLE public.quiz_answer (
 ALTER TABLE public.quiz_answer OWNER TO monkey;
 
 --
--- TOC entry 276 (class 1259 OID 5773344)
+-- TOC entry 286 (class 1259 OID 6930807)
 -- Name: quiz_question_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4279,7 +4280,7 @@ CREATE SEQUENCE public.quiz_question_id_seq
 ALTER TABLE public.quiz_question_id_seq OWNER TO monkey;
 
 --
--- TOC entry 277 (class 1259 OID 5773346)
+-- TOC entry 287 (class 1259 OID 6930809)
 -- Name: quiz_question; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4299,7 +4300,7 @@ CREATE TABLE public.quiz_question (
 ALTER TABLE public.quiz_question OWNER TO monkey;
 
 --
--- TOC entry 278 (class 1259 OID 5773353)
+-- TOC entry 288 (class 1259 OID 6930816)
 -- Name: trending_label_bot_task_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4314,7 +4315,7 @@ CREATE SEQUENCE public.trending_label_bot_task_id_seq
 ALTER TABLE public.trending_label_bot_task_id_seq OWNER TO monkey;
 
 --
--- TOC entry 279 (class 1259 OID 5773355)
+-- TOC entry 289 (class 1259 OID 6930818)
 -- Name: trending_label_bot_task; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4335,7 +4336,7 @@ CREATE TABLE public.trending_label_bot_task (
 ALTER TABLE public.trending_label_bot_task OWNER TO monkey;
 
 --
--- TOC entry 280 (class 1259 OID 5773362)
+-- TOC entry 290 (class 1259 OID 6930825)
 -- Name: trending_label_suggestion_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4350,7 +4351,7 @@ CREATE SEQUENCE public.trending_label_suggestion_id_seq
 ALTER TABLE public.trending_label_suggestion_id_seq OWNER TO monkey;
 
 --
--- TOC entry 281 (class 1259 OID 5773364)
+-- TOC entry 291 (class 1259 OID 6930827)
 -- Name: trending_label_suggestion; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4367,7 +4368,7 @@ CREATE TABLE public.trending_label_suggestion (
 ALTER TABLE public.trending_label_suggestion OWNER TO monkey;
 
 --
--- TOC entry 282 (class 1259 OID 5773368)
+-- TOC entry 292 (class 1259 OID 6930831)
 -- Name: user_annotation_blacklist_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4382,7 +4383,7 @@ CREATE SEQUENCE public.user_annotation_blacklist_id_seq
 ALTER TABLE public.user_annotation_blacklist_id_seq OWNER TO monkey;
 
 --
--- TOC entry 283 (class 1259 OID 5773370)
+-- TOC entry 293 (class 1259 OID 6930833)
 -- Name: user_annotation_blacklist; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4396,7 +4397,7 @@ CREATE TABLE public.user_annotation_blacklist (
 ALTER TABLE public.user_annotation_blacklist OWNER TO monkey;
 
 --
--- TOC entry 284 (class 1259 OID 5773374)
+-- TOC entry 294 (class 1259 OID 6930837)
 -- Name: user_image_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4411,7 +4412,7 @@ CREATE SEQUENCE public.user_image_id_seq
 ALTER TABLE public.user_image_id_seq OWNER TO monkey;
 
 --
--- TOC entry 285 (class 1259 OID 5773376)
+-- TOC entry 295 (class 1259 OID 6930839)
 -- Name: user_image; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4425,7 +4426,7 @@ CREATE TABLE public.user_image (
 ALTER TABLE public.user_image OWNER TO monkey;
 
 --
--- TOC entry 286 (class 1259 OID 5773380)
+-- TOC entry 296 (class 1259 OID 6930843)
 -- Name: user_image_annotation_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4440,7 +4441,7 @@ CREATE SEQUENCE public.user_image_annotation_id_seq
 ALTER TABLE public.user_image_annotation_id_seq OWNER TO monkey;
 
 --
--- TOC entry 287 (class 1259 OID 5773382)
+-- TOC entry 297 (class 1259 OID 6930845)
 -- Name: user_image_annotation; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4455,7 +4456,7 @@ CREATE TABLE public.user_image_annotation (
 ALTER TABLE public.user_image_annotation OWNER TO monkey;
 
 --
--- TOC entry 303 (class 1259 OID 5774272)
+-- TOC entry 298 (class 1259 OID 6930849)
 -- Name: user_image_annotation_suggestion_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4470,7 +4471,7 @@ CREATE SEQUENCE public.user_image_annotation_suggestion_id_seq
 ALTER TABLE public.user_image_annotation_suggestion_id_seq OWNER TO monkey;
 
 --
--- TOC entry 304 (class 1259 OID 5774274)
+-- TOC entry 299 (class 1259 OID 6930851)
 -- Name: user_image_annotation_suggestion; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4485,7 +4486,7 @@ CREATE TABLE public.user_image_annotation_suggestion (
 ALTER TABLE public.user_image_annotation_suggestion OWNER TO monkey;
 
 --
--- TOC entry 288 (class 1259 OID 5773386)
+-- TOC entry 300 (class 1259 OID 6930855)
 -- Name: user_image_collection_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4500,7 +4501,7 @@ CREATE SEQUENCE public.user_image_collection_id_seq
 ALTER TABLE public.user_image_collection_id_seq OWNER TO monkey;
 
 --
--- TOC entry 289 (class 1259 OID 5773388)
+-- TOC entry 301 (class 1259 OID 6930857)
 -- Name: user_image_collection; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4515,7 +4516,7 @@ CREATE TABLE public.user_image_collection (
 ALTER TABLE public.user_image_collection OWNER TO monkey;
 
 --
--- TOC entry 290 (class 1259 OID 5773395)
+-- TOC entry 302 (class 1259 OID 6930864)
 -- Name: user_image_validation_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4530,7 +4531,7 @@ CREATE SEQUENCE public.user_image_validation_id_seq
 ALTER TABLE public.user_image_validation_id_seq OWNER TO monkey;
 
 --
--- TOC entry 291 (class 1259 OID 5773397)
+-- TOC entry 303 (class 1259 OID 6930866)
 -- Name: user_image_validation; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4545,7 +4546,7 @@ CREATE TABLE public.user_image_validation (
 ALTER TABLE public.user_image_validation OWNER TO monkey;
 
 --
--- TOC entry 292 (class 1259 OID 5773401)
+-- TOC entry 304 (class 1259 OID 6930870)
 -- Name: validations_per_app_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4560,7 +4561,7 @@ CREATE SEQUENCE public.validations_per_app_id_seq
 ALTER TABLE public.validations_per_app_id_seq OWNER TO monkey;
 
 --
--- TOC entry 293 (class 1259 OID 5773403)
+-- TOC entry 305 (class 1259 OID 6930872)
 -- Name: validations_per_app; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4574,7 +4575,7 @@ CREATE TABLE public.validations_per_app (
 ALTER TABLE public.validations_per_app OWNER TO monkey;
 
 --
--- TOC entry 294 (class 1259 OID 5773410)
+-- TOC entry 306 (class 1259 OID 6930879)
 -- Name: validations_per_country_id_seq; Type: SEQUENCE; Schema: public; Owner: monkey
 --
 
@@ -4589,7 +4590,7 @@ CREATE SEQUENCE public.validations_per_country_id_seq
 ALTER TABLE public.validations_per_country_id_seq OWNER TO monkey;
 
 --
--- TOC entry 295 (class 1259 OID 5773412)
+-- TOC entry 307 (class 1259 OID 6930881)
 -- Name: validations_per_country; Type: TABLE; Schema: public; Owner: monkey
 --
 
@@ -4603,7 +4604,7 @@ CREATE TABLE public.validations_per_country (
 ALTER TABLE public.validations_per_country OWNER TO monkey;
 
 --
--- TOC entry 3903 (class 2604 OID 5773419)
+-- TOC entry 3904 (class 2604 OID 6930888)
 -- Name: image id; Type: DEFAULT; Schema: public; Owner: monkey
 --
 
@@ -4611,7 +4612,7 @@ ALTER TABLE ONLY public.image ALTER COLUMN id SET DEFAULT nextval('public.image_
 
 
 --
--- TOC entry 3947 (class 2606 OID 5773421)
+-- TOC entry 3947 (class 2606 OID 6930890)
 -- Name: access_token access_token_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4620,7 +4621,7 @@ ALTER TABLE ONLY public.access_token
 
 
 --
--- TOC entry 3956 (class 2606 OID 5773423)
+-- TOC entry 3956 (class 2606 OID 6930892)
 -- Name: account_permission account_permission_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4629,7 +4630,7 @@ ALTER TABLE ONLY public.account_permission
 
 
 --
--- TOC entry 3959 (class 2606 OID 5773425)
+-- TOC entry 3959 (class 2606 OID 6930894)
 -- Name: annotation_data annotation_data_uuid_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4638,7 +4639,7 @@ ALTER TABLE ONLY public.annotation_data
 
 
 --
--- TOC entry 3966 (class 2606 OID 5773427)
+-- TOC entry 3966 (class 2606 OID 6930896)
 -- Name: annotation_refinements_per_country annotation_refinements_per_country_country_code_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4647,7 +4648,7 @@ ALTER TABLE ONLY public.annotation_refinements_per_country
 
 
 --
--- TOC entry 3968 (class 2606 OID 5773429)
+-- TOC entry 3968 (class 2606 OID 6930898)
 -- Name: annotation_refinements_per_country annotation_refinements_per_country_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4656,7 +4657,7 @@ ALTER TABLE ONLY public.annotation_refinements_per_country
 
 
 --
--- TOC entry 4182 (class 2606 OID 5774253)
+-- TOC entry 3970 (class 2606 OID 6930900)
 -- Name: annotation_suggestion_data annotation_suggestion_data_uuid_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4665,7 +4666,7 @@ ALTER TABLE ONLY public.annotation_suggestion_data
 
 
 --
--- TOC entry 3970 (class 2606 OID 5773431)
+-- TOC entry 3977 (class 2606 OID 6930902)
 -- Name: annotation_type annotation_type_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4674,7 +4675,7 @@ ALTER TABLE ONLY public.annotation_type
 
 
 --
--- TOC entry 3972 (class 2606 OID 5773433)
+-- TOC entry 3979 (class 2606 OID 6930904)
 -- Name: annotation_type annotation_type_name_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4683,7 +4684,7 @@ ALTER TABLE ONLY public.annotation_type
 
 
 --
--- TOC entry 3974 (class 2606 OID 5773435)
+-- TOC entry 3981 (class 2606 OID 6930906)
 -- Name: annotations_per_app annotations_per_app_app_identifier_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4692,7 +4693,7 @@ ALTER TABLE ONLY public.annotations_per_app
 
 
 --
--- TOC entry 3976 (class 2606 OID 5773437)
+-- TOC entry 3983 (class 2606 OID 6930908)
 -- Name: annotations_per_app annotations_per_app_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4701,7 +4702,7 @@ ALTER TABLE ONLY public.annotations_per_app
 
 
 --
--- TOC entry 3978 (class 2606 OID 5773439)
+-- TOC entry 3985 (class 2606 OID 6930910)
 -- Name: annotations_per_country annotations_per_country_country_code_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4710,7 +4711,7 @@ ALTER TABLE ONLY public.annotations_per_country
 
 
 --
--- TOC entry 3980 (class 2606 OID 5773441)
+-- TOC entry 3987 (class 2606 OID 6930912)
 -- Name: annotations_per_country annotations_per_country_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4719,7 +4720,7 @@ ALTER TABLE ONLY public.annotations_per_country
 
 
 --
--- TOC entry 3982 (class 2606 OID 5773443)
+-- TOC entry 3989 (class 2606 OID 6930914)
 -- Name: api_token api_token_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4728,7 +4729,7 @@ ALTER TABLE ONLY public.api_token
 
 
 --
--- TOC entry 3984 (class 2606 OID 5773445)
+-- TOC entry 3991 (class 2606 OID 6930916)
 -- Name: api_token api_token_token_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4737,7 +4738,7 @@ ALTER TABLE ONLY public.api_token
 
 
 --
--- TOC entry 3987 (class 2606 OID 5773447)
+-- TOC entry 3994 (class 2606 OID 6930918)
 -- Name: donations_per_app donations_per_app_app_identifier_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4746,7 +4747,7 @@ ALTER TABLE ONLY public.donations_per_app
 
 
 --
--- TOC entry 3989 (class 2606 OID 5773449)
+-- TOC entry 3996 (class 2606 OID 6930920)
 -- Name: donations_per_app donations_per_app_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4755,7 +4756,7 @@ ALTER TABLE ONLY public.donations_per_app
 
 
 --
--- TOC entry 3991 (class 2606 OID 5773451)
+-- TOC entry 3998 (class 2606 OID 6930922)
 -- Name: donations_per_country donations_per_country_country_code_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4764,7 +4765,7 @@ ALTER TABLE ONLY public.donations_per_country
 
 
 --
--- TOC entry 3993 (class 2606 OID 5773453)
+-- TOC entry 4000 (class 2606 OID 6930924)
 -- Name: donations_per_country donations_per_country_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4773,7 +4774,7 @@ ALTER TABLE ONLY public.donations_per_country
 
 
 --
--- TOC entry 4016 (class 2606 OID 5773455)
+-- TOC entry 4023 (class 2606 OID 6930926)
 -- Name: image_annotation_coverage image_annotation_coverage_image_id_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4782,7 +4783,7 @@ ALTER TABLE ONLY public.image_annotation_coverage
 
 
 --
--- TOC entry 4018 (class 2606 OID 5773457)
+-- TOC entry 4025 (class 2606 OID 6930928)
 -- Name: image_annotation_coverage image_annotation_coverage_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4791,7 +4792,7 @@ ALTER TABLE ONLY public.image_annotation_coverage
 
 
 --
--- TOC entry 3964 (class 2606 OID 5773459)
+-- TOC entry 3964 (class 2606 OID 6930930)
 -- Name: annotation_data image_annotation_data_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4800,7 +4801,7 @@ ALTER TABLE ONLY public.annotation_data
 
 
 --
--- TOC entry 4007 (class 2606 OID 5773461)
+-- TOC entry 4014 (class 2606 OID 6930932)
 -- Name: image_annotation image_annotation_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4809,7 +4810,7 @@ ALTER TABLE ONLY public.image_annotation
 
 
 --
--- TOC entry 4010 (class 2606 OID 5773463)
+-- TOC entry 4017 (class 2606 OID 6930934)
 -- Name: image_annotation image_annotation_image_label_uniquekey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4818,7 +4819,7 @@ ALTER TABLE ONLY public.image_annotation
 
 
 --
--- TOC entry 4021 (class 2606 OID 5773465)
+-- TOC entry 4028 (class 2606 OID 6930936)
 -- Name: image_annotation_refinement image_annotation_refinement_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4827,7 +4828,7 @@ ALTER TABLE ONLY public.image_annotation_refinement
 
 
 --
--- TOC entry 4023 (class 2606 OID 5773467)
+-- TOC entry 4030 (class 2606 OID 6930938)
 -- Name: image_annotation_refinement image_annotation_refinement_label_annotation_data_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4836,7 +4837,7 @@ ALTER TABLE ONLY public.image_annotation_refinement
 
 
 --
--- TOC entry 4026 (class 2606 OID 5773469)
+-- TOC entry 4033 (class 2606 OID 6930940)
 -- Name: image_annotation_revision image_annotation_revision_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4845,7 +4846,7 @@ ALTER TABLE ONLY public.image_annotation_revision
 
 
 --
--- TOC entry 4187 (class 2606 OID 5774251)
+-- TOC entry 3975 (class 2606 OID 6930942)
 -- Name: annotation_suggestion_data image_annotation_suggestion_data_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4854,7 +4855,7 @@ ALTER TABLE ONLY public.annotation_suggestion_data
 
 
 --
--- TOC entry 4172 (class 2606 OID 5774173)
+-- TOC entry 4036 (class 2606 OID 6930944)
 -- Name: image_annotation_suggestion image_annotation_suggestion_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4863,7 +4864,7 @@ ALTER TABLE ONLY public.image_annotation_suggestion
 
 
 --
--- TOC entry 4175 (class 2606 OID 5774293)
+-- TOC entry 4039 (class 2606 OID 6930946)
 -- Name: image_annotation_suggestion image_annotation_suggestion_image_label_suggestion_uniquekey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4872,7 +4873,7 @@ ALTER TABLE ONLY public.image_annotation_suggestion
 
 
 --
--- TOC entry 4195 (class 2606 OID 5774477)
+-- TOC entry 4045 (class 2606 OID 6930948)
 -- Name: image_annotation_suggestion_refinement image_annotation_suggestion_refinement_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4881,7 +4882,7 @@ ALTER TABLE ONLY public.image_annotation_suggestion_refinement
 
 
 --
--- TOC entry 4197 (class 2606 OID 5774479)
+-- TOC entry 4047 (class 2606 OID 6930950)
 -- Name: image_annotation_suggestion_refinement image_annotation_suggestion_refinement_label_annotation_suggest; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4890,7 +4891,7 @@ ALTER TABLE ONLY public.image_annotation_suggestion_refinement
 
 
 --
--- TOC entry 4180 (class 2606 OID 5774204)
+-- TOC entry 4050 (class 2606 OID 6930952)
 -- Name: image_annotation_suggestion_revision image_annotation_suggestion_revision_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4899,7 +4900,7 @@ ALTER TABLE ONLY public.image_annotation_suggestion_revision
 
 
 --
--- TOC entry 4030 (class 2606 OID 5773471)
+-- TOC entry 4054 (class 2606 OID 6930954)
 -- Name: image_collection_image image_collection_image_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4908,7 +4909,7 @@ ALTER TABLE ONLY public.image_collection_image
 
 
 --
--- TOC entry 4033 (class 2606 OID 5773473)
+-- TOC entry 4057 (class 2606 OID 6930956)
 -- Name: image_collection_image image_collection_image_user_image_collection_id_image_id_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4917,7 +4918,7 @@ ALTER TABLE ONLY public.image_collection_image
 
 
 --
--- TOC entry 4042 (class 2606 OID 5773475)
+-- TOC entry 4066 (class 2606 OID 6930958)
 -- Name: image_description image_description_text_image_id_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4926,7 +4927,7 @@ ALTER TABLE ONLY public.image_description
 
 
 --
--- TOC entry 4044 (class 2606 OID 5773477)
+-- TOC entry 4068 (class 2606 OID 6930960)
 -- Name: image_description image_description_uuid_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4935,7 +4936,7 @@ ALTER TABLE ONLY public.image_description
 
 
 --
--- TOC entry 4046 (class 2606 OID 5773479)
+-- TOC entry 4070 (class 2606 OID 6930962)
 -- Name: image_descriptions_per_country image_descriptions_per_country_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4944,7 +4945,7 @@ ALTER TABLE ONLY public.image_descriptions_per_country
 
 
 --
--- TOC entry 4048 (class 2606 OID 5773481)
+-- TOC entry 4072 (class 2606 OID 6930964)
 -- Name: image_descriptions_per_country image_descriptions_per_country_unique_country_code; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4953,7 +4954,7 @@ ALTER TABLE ONLY public.image_descriptions_per_country
 
 
 --
--- TOC entry 3997 (class 2606 OID 5773483)
+-- TOC entry 4004 (class 2606 OID 6930966)
 -- Name: image image_hash_unique_key; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4962,7 +4963,7 @@ ALTER TABLE ONLY public.image
 
 
 --
--- TOC entry 3999 (class 2606 OID 5773485)
+-- TOC entry 4006 (class 2606 OID 6930968)
 -- Name: image image_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4971,7 +4972,7 @@ ALTER TABLE ONLY public.image
 
 
 --
--- TOC entry 4003 (class 2606 OID 5773487)
+-- TOC entry 4010 (class 2606 OID 6930970)
 -- Name: image image_key_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4980,7 +4981,7 @@ ALTER TABLE ONLY public.image
 
 
 --
--- TOC entry 4052 (class 2606 OID 5773489)
+-- TOC entry 4076 (class 2606 OID 6930972)
 -- Name: image_label_suggestion image_label_suggestion_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4989,7 +4990,7 @@ ALTER TABLE ONLY public.image_label_suggestion
 
 
 --
--- TOC entry 4054 (class 2606 OID 5773491)
+-- TOC entry 4078 (class 2606 OID 6930974)
 -- Name: image_label_suggestion image_label_suggestion_image_id_label_suggestion_id_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -4998,7 +4999,7 @@ ALTER TABLE ONLY public.image_label_suggestion
 
 
 --
--- TOC entry 4056 (class 2606 OID 5774295)
+-- TOC entry 4080 (class 2606 OID 6930976)
 -- Name: image_label_suggestion image_label_suggestion_uuid_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5007,7 +5008,7 @@ ALTER TABLE ONLY public.image_label_suggestion
 
 
 --
--- TOC entry 4058 (class 2606 OID 5773493)
+-- TOC entry 4082 (class 2606 OID 6930978)
 -- Name: image_provider image_provider_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5016,7 +5017,7 @@ ALTER TABLE ONLY public.image_provider
 
 
 --
--- TOC entry 4061 (class 2606 OID 5773495)
+-- TOC entry 4085 (class 2606 OID 6930980)
 -- Name: image_quarantine image_quarantine_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5025,7 +5026,7 @@ ALTER TABLE ONLY public.image_quarantine
 
 
 --
--- TOC entry 4063 (class 2606 OID 5773497)
+-- TOC entry 4087 (class 2606 OID 6930982)
 -- Name: image_quarantine image_quarantine_image_id_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5034,7 +5035,7 @@ ALTER TABLE ONLY public.image_quarantine
 
 
 --
--- TOC entry 4069 (class 2606 OID 5773499)
+-- TOC entry 4093 (class 2606 OID 6930984)
 -- Name: image_source image_source_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5043,7 +5044,7 @@ ALTER TABLE ONLY public.image_source
 
 
 --
--- TOC entry 4073 (class 2606 OID 5773501)
+-- TOC entry 4097 (class 2606 OID 6930986)
 -- Name: image_validation image_validation_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5052,7 +5053,7 @@ ALTER TABLE ONLY public.image_validation
 
 
 --
--- TOC entry 4076 (class 2606 OID 5773503)
+-- TOC entry 4100 (class 2606 OID 6930988)
 -- Name: image_validation image_validation_image_label_uniquekey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5061,7 +5062,7 @@ ALTER TABLE ONLY public.image_validation
 
 
 --
--- TOC entry 4082 (class 2606 OID 5773505)
+-- TOC entry 4106 (class 2606 OID 6930990)
 -- Name: image_validation_source image_validation_source_id; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5070,7 +5071,7 @@ ALTER TABLE ONLY public.image_validation_source
 
 
 --
--- TOC entry 4085 (class 2606 OID 5773507)
+-- TOC entry 4109 (class 2606 OID 6930992)
 -- Name: imagehunt_task imagehunt_task_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5079,7 +5080,7 @@ ALTER TABLE ONLY public.imagehunt_task
 
 
 --
--- TOC entry 4096 (class 2606 OID 5773509)
+-- TOC entry 4120 (class 2606 OID 6930994)
 -- Name: label_accessor label_accessor_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5088,7 +5089,7 @@ ALTER TABLE ONLY public.label_accessor
 
 
 --
--- TOC entry 4098 (class 2606 OID 5773511)
+-- TOC entry 4122 (class 2606 OID 6930996)
 -- Name: label_accessor label_accessor_label_id_accessor_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5097,7 +5098,7 @@ ALTER TABLE ONLY public.label_accessor
 
 
 --
--- TOC entry 4088 (class 2606 OID 5773513)
+-- TOC entry 4112 (class 2606 OID 6930998)
 -- Name: label label_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5106,7 +5107,7 @@ ALTER TABLE ONLY public.label
 
 
 --
--- TOC entry 4091 (class 2606 OID 5773515)
+-- TOC entry 4115 (class 2606 OID 6931000)
 -- Name: label label_name_parent_id_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5115,7 +5116,7 @@ ALTER TABLE ONLY public.label
 
 
 --
--- TOC entry 4102 (class 2606 OID 5773517)
+-- TOC entry 4126 (class 2606 OID 6931002)
 -- Name: label_suggestion label_suggestion_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5124,7 +5125,7 @@ ALTER TABLE ONLY public.label_suggestion
 
 
 --
--- TOC entry 4104 (class 2606 OID 5773519)
+-- TOC entry 4128 (class 2606 OID 6931004)
 -- Name: label_suggestion label_suggestion_name_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5133,7 +5134,7 @@ ALTER TABLE ONLY public.label_suggestion
 
 
 --
--- TOC entry 4106 (class 2606 OID 5774330)
+-- TOC entry 4130 (class 2606 OID 6931006)
 -- Name: label_suggestion label_suggestion_uuid_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5142,7 +5143,7 @@ ALTER TABLE ONLY public.label_suggestion
 
 
 --
--- TOC entry 4093 (class 2606 OID 5773521)
+-- TOC entry 4117 (class 2606 OID 6931008)
 -- Name: label label_uuid_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5151,7 +5152,7 @@ ALTER TABLE ONLY public.label
 
 
 --
--- TOC entry 4108 (class 2606 OID 5773523)
+-- TOC entry 4132 (class 2606 OID 6931010)
 -- Name: language language_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5160,7 +5161,7 @@ ALTER TABLE ONLY public.language
 
 
 --
--- TOC entry 4110 (class 2606 OID 5773525)
+-- TOC entry 4134 (class 2606 OID 6931012)
 -- Name: language language_name_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5169,7 +5170,7 @@ ALTER TABLE ONLY public.language
 
 
 --
--- TOC entry 4114 (class 2606 OID 5773527)
+-- TOC entry 4138 (class 2606 OID 6931014)
 -- Name: quiz_answer quiz_answer_label_id_quiz_question_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5178,7 +5179,7 @@ ALTER TABLE ONLY public.quiz_answer
 
 
 --
--- TOC entry 4116 (class 2606 OID 5773529)
+-- TOC entry 4140 (class 2606 OID 6931016)
 -- Name: quiz_answer quiz_id_pley; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5187,7 +5188,7 @@ ALTER TABLE ONLY public.quiz_answer
 
 
 --
--- TOC entry 4119 (class 2606 OID 5773531)
+-- TOC entry 4143 (class 2606 OID 6931018)
 -- Name: quiz_question quiz_question_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5196,7 +5197,7 @@ ALTER TABLE ONLY public.quiz_question
 
 
 --
--- TOC entry 4121 (class 2606 OID 5773533)
+-- TOC entry 4145 (class 2606 OID 6931020)
 -- Name: quiz_question quiz_question_uuid_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5205,7 +5206,7 @@ ALTER TABLE ONLY public.quiz_question
 
 
 --
--- TOC entry 4066 (class 2606 OID 5773535)
+-- TOC entry 4090 (class 2606 OID 6931022)
 -- Name: image_report report_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5214,7 +5215,7 @@ ALTER TABLE ONLY public.image_report
 
 
 --
--- TOC entry 4124 (class 2606 OID 5773537)
+-- TOC entry 4148 (class 2606 OID 6931024)
 -- Name: trending_label_bot_task trending_label_bot_task_branch_name_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5223,7 +5224,7 @@ ALTER TABLE ONLY public.trending_label_bot_task
 
 
 --
--- TOC entry 4126 (class 2606 OID 5773539)
+-- TOC entry 4150 (class 2606 OID 6931026)
 -- Name: trending_label_bot_task trending_label_bot_task_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5232,7 +5233,7 @@ ALTER TABLE ONLY public.trending_label_bot_task
 
 
 --
--- TOC entry 4132 (class 2606 OID 5773541)
+-- TOC entry 4156 (class 2606 OID 6931028)
 -- Name: trending_label_suggestion trending_label_suggestion_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5241,7 +5242,7 @@ ALTER TABLE ONLY public.trending_label_suggestion
 
 
 --
--- TOC entry 4128 (class 2606 OID 5773543)
+-- TOC entry 4152 (class 2606 OID 6931030)
 -- Name: trending_label_bot_task trending_label_suggestion_id_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5250,7 +5251,7 @@ ALTER TABLE ONLY public.trending_label_bot_task
 
 
 --
--- TOC entry 4134 (class 2606 OID 5773545)
+-- TOC entry 4158 (class 2606 OID 6931032)
 -- Name: trending_label_suggestion trending_label_suggestion_label_suggestion_id_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5259,7 +5260,7 @@ ALTER TABLE ONLY public.trending_label_suggestion
 
 
 --
--- TOC entry 4138 (class 2606 OID 5773547)
+-- TOC entry 4162 (class 2606 OID 6931034)
 -- Name: user_annotation_blacklist user_annotation_blacklist_account_id_image_validation_id_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5268,7 +5269,7 @@ ALTER TABLE ONLY public.user_annotation_blacklist
 
 
 --
--- TOC entry 4150 (class 2606 OID 5773549)
+-- TOC entry 4174 (class 2606 OID 6931036)
 -- Name: user_image_annotation user_annotation_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5277,7 +5278,7 @@ ALTER TABLE ONLY public.user_image_annotation
 
 
 --
--- TOC entry 4191 (class 2606 OID 5774279)
+-- TOC entry 4178 (class 2606 OID 6931038)
 -- Name: user_image_annotation_suggestion user_annotation_suggestion_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5286,7 +5287,7 @@ ALTER TABLE ONLY public.user_image_annotation_suggestion
 
 
 --
--- TOC entry 3950 (class 2606 OID 5773551)
+-- TOC entry 3950 (class 2606 OID 6931040)
 -- Name: account user_email_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5295,7 +5296,7 @@ ALTER TABLE ONLY public.account
 
 
 --
--- TOC entry 3952 (class 2606 OID 5773553)
+-- TOC entry 3952 (class 2606 OID 6931042)
 -- Name: account user_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5304,7 +5305,7 @@ ALTER TABLE ONLY public.account
 
 
 --
--- TOC entry 4140 (class 2606 OID 5773555)
+-- TOC entry 4164 (class 2606 OID 6931044)
 -- Name: user_annotation_blacklist user_image_blacklist_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5313,7 +5314,7 @@ ALTER TABLE ONLY public.user_annotation_blacklist
 
 
 --
--- TOC entry 4154 (class 2606 OID 5773557)
+-- TOC entry 4182 (class 2606 OID 6931046)
 -- Name: user_image_collection user_image_collection_account_id_name_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5322,7 +5323,7 @@ ALTER TABLE ONLY public.user_image_collection
 
 
 --
--- TOC entry 4156 (class 2606 OID 5773559)
+-- TOC entry 4184 (class 2606 OID 6931048)
 -- Name: user_image_collection user_image_collection_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5331,7 +5332,7 @@ ALTER TABLE ONLY public.user_image_collection
 
 
 --
--- TOC entry 4145 (class 2606 OID 5773561)
+-- TOC entry 4169 (class 2606 OID 6931050)
 -- Name: user_image user_image_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5340,7 +5341,7 @@ ALTER TABLE ONLY public.user_image
 
 
 --
--- TOC entry 4161 (class 2606 OID 5773563)
+-- TOC entry 4189 (class 2606 OID 6931052)
 -- Name: user_image_validation user_image_validation_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5349,7 +5350,7 @@ ALTER TABLE ONLY public.user_image_validation
 
 
 --
--- TOC entry 3954 (class 2606 OID 5773565)
+-- TOC entry 3954 (class 2606 OID 6931054)
 -- Name: account user_name_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5358,7 +5359,7 @@ ALTER TABLE ONLY public.account
 
 
 --
--- TOC entry 4163 (class 2606 OID 5773567)
+-- TOC entry 4191 (class 2606 OID 6931056)
 -- Name: validations_per_app validations_per_app_app_identifier_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5367,7 +5368,7 @@ ALTER TABLE ONLY public.validations_per_app
 
 
 --
--- TOC entry 4165 (class 2606 OID 5773569)
+-- TOC entry 4193 (class 2606 OID 6931058)
 -- Name: validations_per_app validations_per_app_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5376,7 +5377,7 @@ ALTER TABLE ONLY public.validations_per_app
 
 
 --
--- TOC entry 4167 (class 2606 OID 5773571)
+-- TOC entry 4195 (class 2606 OID 6931060)
 -- Name: validations_per_country validations_per_country_country_code_unique; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5385,7 +5386,7 @@ ALTER TABLE ONLY public.validations_per_country
 
 
 --
--- TOC entry 4169 (class 2606 OID 5773573)
+-- TOC entry 4197 (class 2606 OID 6931062)
 -- Name: validations_per_country validations_per_country_id_pkey; Type: CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -5394,7 +5395,7 @@ ALTER TABLE ONLY public.validations_per_country
 
 
 --
--- TOC entry 3948 (class 1259 OID 5773574)
+-- TOC entry 3948 (class 1259 OID 6931063)
 -- Name: fki_access_token_user_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5402,7 +5403,7 @@ CREATE INDEX fki_access_token_user_id_fkey ON public.access_token USING btree (u
 
 
 --
--- TOC entry 3957 (class 1259 OID 5773575)
+-- TOC entry 3957 (class 1259 OID 6931064)
 -- Name: fki_account_permission_account_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5410,7 +5411,7 @@ CREATE INDEX fki_account_permission_account_id_fkey ON public.account_permission
 
 
 --
--- TOC entry 3960 (class 1259 OID 5773576)
+-- TOC entry 3960 (class 1259 OID 6931065)
 -- Name: fki_annotation_data_annotation_type_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5418,7 +5419,7 @@ CREATE INDEX fki_annotation_data_annotation_type_fkey ON public.annotation_data
 
 
 --
--- TOC entry 3961 (class 1259 OID 5773577)
+-- TOC entry 3961 (class 1259 OID 6931066)
 -- Name: fki_annotation_data_image_annotation_revision_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5426,7 +5427,7 @@ CREATE INDEX fki_annotation_data_image_annotation_revision_id_fkey ON public.ann
 
 
 --
--- TOC entry 4183 (class 1259 OID 5774269)
+-- TOC entry 3971 (class 1259 OID 6931067)
 -- Name: fki_annotation_suggestion_data_annotation_type_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5434,7 +5435,7 @@ CREATE INDEX fki_annotation_suggestion_data_annotation_type_fkey ON public.annot
 
 
 --
--- TOC entry 4184 (class 1259 OID 5774270)
+-- TOC entry 3972 (class 1259 OID 6931068)
 -- Name: fki_annotation_suggestion_data_image_annotation_suggestion_revi; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5442,7 +5443,7 @@ CREATE INDEX fki_annotation_suggestion_data_image_annotation_suggestion_revi ON
 
 
 --
--- TOC entry 3985 (class 1259 OID 5773578)
+-- TOC entry 3992 (class 1259 OID 6931069)
 -- Name: fki_api_token_account_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5450,7 +5451,7 @@ CREATE INDEX fki_api_token_account_id_fkey ON public.api_token USING btree (acco
 
 
 --
--- TOC entry 4013 (class 1259 OID 5773579)
+-- TOC entry 4020 (class 1259 OID 6931070)
 -- Name: fki_image_annotation_coverage_image_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5458,7 +5459,7 @@ CREATE INDEX fki_image_annotation_coverage_image_id_fkey ON public.image_annotat
 
 
 --
--- TOC entry 3962 (class 1259 OID 5773580)
+-- TOC entry 3962 (class 1259 OID 6931071)
 -- Name: fki_image_annotation_data_annotation_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5466,7 +5467,7 @@ CREATE INDEX fki_image_annotation_data_annotation_id_fkey ON public.annotation_d
 
 
 --
--- TOC entry 4005 (class 1259 OID 5773581)
+-- TOC entry 4012 (class 1259 OID 6931072)
 -- Name: fki_image_annotation_label_id_key; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5474,7 +5475,7 @@ CREATE INDEX fki_image_annotation_label_id_key ON public.image_annotation USING
 
 
 --
--- TOC entry 4024 (class 1259 OID 5773582)
+-- TOC entry 4031 (class 1259 OID 6931073)
 -- Name: fki_image_annotation_revision_image_annotation_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5482,7 +5483,7 @@ CREATE INDEX fki_image_annotation_revision_image_annotation_id_fkey ON public.im
 
 
 --
--- TOC entry 4185 (class 1259 OID 5774271)
+-- TOC entry 3973 (class 1259 OID 6931074)
 -- Name: fki_image_annotation_suggestion_data_annotation_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5490,7 +5491,7 @@ CREATE INDEX fki_image_annotation_suggestion_data_annotation_id_fkey ON public.a
 
 
 --
--- TOC entry 4170 (class 1259 OID 5774186)
+-- TOC entry 4034 (class 1259 OID 6931075)
 -- Name: fki_image_annotation_suggestion_label_suggestion_id_label_sugge; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5498,7 +5499,7 @@ CREATE INDEX fki_image_annotation_suggestion_label_suggestion_id_label_sugge ON
 
 
 --
--- TOC entry 4178 (class 1259 OID 5774210)
+-- TOC entry 4048 (class 1259 OID 6931076)
 -- Name: fki_image_annotation_suggestion_revision_image_annotation_sugge; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5506,7 +5507,7 @@ CREATE INDEX fki_image_annotation_suggestion_revision_image_annotation_sugge ON
 
 
 --
--- TOC entry 4027 (class 1259 OID 5773583)
+-- TOC entry 4051 (class 1259 OID 6931077)
 -- Name: fki_image_collection_image_image_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5514,7 +5515,7 @@ CREATE INDEX fki_image_collection_image_image_id_fkey ON public.image_collection
 
 
 --
--- TOC entry 4028 (class 1259 OID 5773584)
+-- TOC entry 4052 (class 1259 OID 6931078)
 -- Name: fki_image_collection_image_user_image_collection_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5522,7 +5523,7 @@ CREATE INDEX fki_image_collection_image_user_image_collection_id_fkey ON public.
 
 
 --
--- TOC entry 4035 (class 1259 OID 5773585)
+-- TOC entry 4059 (class 1259 OID 6931079)
 -- Name: fki_image_description_language_language_id; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5530,7 +5531,7 @@ CREATE INDEX fki_image_description_language_language_id ON public.image_descript
 
 
 --
--- TOC entry 4036 (class 1259 OID 5773586)
+-- TOC entry 4060 (class 1259 OID 6931080)
 -- Name: fki_image_description_unlocked_by_account_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5538,7 +5539,7 @@ CREATE INDEX fki_image_description_unlocked_by_account_id_fkey ON public.image_d
 
 
 --
--- TOC entry 4037 (class 1259 OID 5773587)
+-- TOC entry 4061 (class 1259 OID 6931081)
 -- Name: fki_image_id_image_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5546,7 +5547,7 @@ CREATE INDEX fki_image_id_image_id_fkey ON public.image_description USING btree
 
 
 --
--- TOC entry 4049 (class 1259 OID 5773588)
+-- TOC entry 4073 (class 1259 OID 6931082)
 -- Name: fki_image_label_suggestion_image_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5554,7 +5555,7 @@ CREATE INDEX fki_image_label_suggestion_image_id_fkey ON public.image_label_sugg
 
 
 --
--- TOC entry 4050 (class 1259 OID 5773589)
+-- TOC entry 4074 (class 1259 OID 6931083)
 -- Name: fki_image_label_suggestion_label_suggestion_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5562,7 +5563,7 @@ CREATE INDEX fki_image_label_suggestion_label_suggestion_id_fkey ON public.image
 
 
 --
--- TOC entry 3994 (class 1259 OID 5773590)
+-- TOC entry 4001 (class 1259 OID 6931084)
 -- Name: fki_image_provider_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5570,7 +5571,7 @@ CREATE INDEX fki_image_provider_id_fkey ON public.image USING btree (image_provi
 
 
 --
--- TOC entry 4059 (class 1259 OID 5773591)
+-- TOC entry 4083 (class 1259 OID 6931085)
 -- Name: fki_image_quarantine_image_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5578,7 +5579,7 @@ CREATE INDEX fki_image_quarantine_image_id_fkey ON public.image_quarantine USING
 
 
 --
--- TOC entry 4019 (class 1259 OID 5773592)
+-- TOC entry 4026 (class 1259 OID 6931086)
 -- Name: fki_image_quiz_image_annotation_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5586,7 +5587,7 @@ CREATE INDEX fki_image_quiz_image_annotation_id_fkey ON public.image_annotation_
 
 
 --
--- TOC entry 4192 (class 1259 OID 5774490)
+-- TOC entry 4042 (class 1259 OID 6931087)
 -- Name: fki_image_quiz_image_annotation_suggestion_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5594,7 +5595,7 @@ CREATE INDEX fki_image_quiz_image_annotation_suggestion_id_fkey ON public.image_
 
 
 --
--- TOC entry 4193 (class 1259 OID 5774491)
+-- TOC entry 4043 (class 1259 OID 6931088)
 -- Name: fki_image_quiz_label_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5602,7 +5603,7 @@ CREATE INDEX fki_image_quiz_label_id_fkey ON public.image_annotation_suggestion_
 
 
 --
--- TOC entry 4064 (class 1259 OID 5773594)
+-- TOC entry 4088 (class 1259 OID 6931089)
 -- Name: fki_image_report_image_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5610,7 +5611,7 @@ CREATE INDEX fki_image_report_image_id_fkey ON public.image_report USING btree (
 
 
 --
--- TOC entry 4067 (class 1259 OID 5773595)
+-- TOC entry 4091 (class 1259 OID 6931090)
 -- Name: fki_image_source_image_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5618,7 +5619,7 @@ CREATE INDEX fki_image_source_image_id_fkey ON public.image_source USING btree (
 
 
 --
--- TOC entry 4070 (class 1259 OID 5773596)
+-- TOC entry 4094 (class 1259 OID 6931091)
 -- Name: fki_image_validation_image_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5626,7 +5627,7 @@ CREATE INDEX fki_image_validation_image_id_fkey ON public.image_validation USING
 
 
 --
--- TOC entry 4071 (class 1259 OID 5773597)
+-- TOC entry 4095 (class 1259 OID 6931092)
 -- Name: fki_image_validation_label_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5634,7 +5635,7 @@ CREATE INDEX fki_image_validation_label_id_fkey ON public.image_validation USING
 
 
 --
--- TOC entry 4079 (class 1259 OID 5773598)
+-- TOC entry 4103 (class 1259 OID 6931093)
 -- Name: fki_image_validation_source_image_source_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5642,7 +5643,7 @@ CREATE INDEX fki_image_validation_source_image_source_id_fkey ON public.image_va
 
 
 --
--- TOC entry 4080 (class 1259 OID 5773599)
+-- TOC entry 4104 (class 1259 OID 6931094)
 -- Name: fki_image_validation_source_image_validation_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5650,7 +5651,7 @@ CREATE INDEX fki_image_validation_source_image_validation_id_fkey ON public.imag
 
 
 --
--- TOC entry 4083 (class 1259 OID 5773600)
+-- TOC entry 4107 (class 1259 OID 6931095)
 -- Name: fki_imagehunt_task_image_validation_id_image_validation_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5658,7 +5659,7 @@ CREATE INDEX fki_imagehunt_task_image_validation_id_image_validation_id_fkey ON
 
 
 --
--- TOC entry 4094 (class 1259 OID 5773601)
+-- TOC entry 4118 (class 1259 OID 6931096)
 -- Name: fki_label_accessor_label_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5666,7 +5667,7 @@ CREATE INDEX fki_label_accessor_label_id_fkey ON public.label_accessor USING btr
 
 
 --
--- TOC entry 4099 (class 1259 OID 5773602)
+-- TOC entry 4123 (class 1259 OID 6931097)
 -- Name: fki_label_example_label_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5674,7 +5675,7 @@ CREATE INDEX fki_label_example_label_id_fkey ON public.label_example USING btree
 
 
 --
--- TOC entry 4086 (class 1259 OID 5773603)
+-- TOC entry 4110 (class 1259 OID 6931098)
 -- Name: fki_label_parent_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5682,7 +5683,7 @@ CREATE INDEX fki_label_parent_id_fkey ON public.label USING btree (parent_id);
 
 
 --
--- TOC entry 4100 (class 1259 OID 5773604)
+-- TOC entry 4124 (class 1259 OID 6931099)
 -- Name: fki_label_suggestion_proposed_by_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5690,7 +5691,7 @@ CREATE INDEX fki_label_suggestion_proposed_by_fkey ON public.label_suggestion US
 
 
 --
--- TOC entry 4111 (class 1259 OID 5773605)
+-- TOC entry 4135 (class 1259 OID 6931100)
 -- Name: fki_quiz_label_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5698,7 +5699,7 @@ CREATE INDEX fki_quiz_label_id_fkey ON public.quiz_answer USING btree (label_id)
 
 
 --
--- TOC entry 4117 (class 1259 OID 5773606)
+-- TOC entry 4141 (class 1259 OID 6931101)
 -- Name: fki_quiz_question_refines_label_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5706,7 +5707,7 @@ CREATE INDEX fki_quiz_question_refines_label_id_fkey ON public.quiz_question USI
 
 
 --
--- TOC entry 4112 (class 1259 OID 5773607)
+-- TOC entry 4136 (class 1259 OID 6931102)
 -- Name: fki_quiz_quiz_question_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5714,7 +5715,7 @@ CREATE INDEX fki_quiz_quiz_question_id_fkey ON public.quiz_answer USING btree (q
 
 
 --
--- TOC entry 4122 (class 1259 OID 5773608)
+-- TOC entry 4146 (class 1259 OID 6931103)
 -- Name: fki_trending_label_suggestion_id_trending_label_suggestion_id_f; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5722,7 +5723,7 @@ CREATE INDEX fki_trending_label_suggestion_id_trending_label_suggestion_id_f ON
 
 
 --
--- TOC entry 4129 (class 1259 OID 5773609)
+-- TOC entry 4153 (class 1259 OID 6931104)
 -- Name: fki_trending_label_suggestion_label_suggestion_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5730,7 +5731,7 @@ CREATE INDEX fki_trending_label_suggestion_label_suggestion_id_fkey ON public.tr
 
 
 --
--- TOC entry 4130 (class 1259 OID 5773610)
+-- TOC entry 4154 (class 1259 OID 6931105)
 -- Name: fki_trending_label_suggestion_productive_label_id_label_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5738,7 +5739,7 @@ CREATE INDEX fki_trending_label_suggestion_productive_label_id_label_id_fkey ON
 
 
 --
--- TOC entry 4135 (class 1259 OID 5773611)
+-- TOC entry 4159 (class 1259 OID 6931106)
 -- Name: fki_user_annotation_blacklist_account_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5746,7 +5747,7 @@ CREATE INDEX fki_user_annotation_blacklist_account_id_fkey ON public.user_annota
 
 
 --
--- TOC entry 4136 (class 1259 OID 5773612)
+-- TOC entry 4160 (class 1259 OID 6931107)
 -- Name: fki_user_annotation_blacklist_image_validation_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5754,7 +5755,7 @@ CREATE INDEX fki_user_annotation_blacklist_image_validation_id_fkey ON public.us
 
 
 --
--- TOC entry 4141 (class 1259 OID 5773613)
+-- TOC entry 4165 (class 1259 OID 6931108)
 -- Name: fki_user_image_account_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5762,7 +5763,7 @@ CREATE INDEX fki_user_image_account_id_fkey ON public.user_image USING btree (ac
 
 
 --
--- TOC entry 4147 (class 1259 OID 5773614)
+-- TOC entry 4171 (class 1259 OID 6931109)
 -- Name: fki_user_image_annotation_image_annotation_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5770,7 +5771,7 @@ CREATE INDEX fki_user_image_annotation_image_annotation_id_fkey ON public.user_i
 
 
 --
--- TOC entry 4188 (class 1259 OID 5774290)
+-- TOC entry 4175 (class 1259 OID 6931110)
 -- Name: fki_user_image_annotation_suggestion_image_annotation_suggestio; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5778,7 +5779,7 @@ CREATE INDEX fki_user_image_annotation_suggestion_image_annotation_suggestio ON
 
 
 --
--- TOC entry 4189 (class 1259 OID 5774291)
+-- TOC entry 4176 (class 1259 OID 6931111)
 -- Name: fki_user_image_annotation_suggestion_user_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5786,7 +5787,7 @@ CREATE INDEX fki_user_image_annotation_suggestion_user_id_fkey ON public.user_im
 
 
 --
--- TOC entry 4148 (class 1259 OID 5773615)
+-- TOC entry 4172 (class 1259 OID 6931112)
 -- Name: fki_user_image_annotation_user_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5794,7 +5795,7 @@ CREATE INDEX fki_user_image_annotation_user_id_fkey ON public.user_image_annotat
 
 
 --
--- TOC entry 4151 (class 1259 OID 5773616)
+-- TOC entry 4179 (class 1259 OID 6931113)
 -- Name: fki_user_image_collection_account_id_account_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5802,7 +5803,7 @@ CREATE INDEX fki_user_image_collection_account_id_account_id_fkey ON public.user
 
 
 --
--- TOC entry 4142 (class 1259 OID 5773617)
+-- TOC entry 4166 (class 1259 OID 6931114)
 -- Name: fki_user_image_image_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5810,7 +5811,7 @@ CREATE INDEX fki_user_image_image_id_fkey ON public.user_image USING btree (imag
 
 
 --
--- TOC entry 4158 (class 1259 OID 5773618)
+-- TOC entry 4186 (class 1259 OID 6931115)
 -- Name: fki_user_image_validation_acccount_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5818,7 +5819,7 @@ CREATE INDEX fki_user_image_validation_acccount_id_fkey ON public.user_image_val
 
 
 --
--- TOC entry 4159 (class 1259 OID 5773619)
+-- TOC entry 4187 (class 1259 OID 6931116)
 -- Name: fki_user_image_validation_account_id_fkey; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5826,7 +5827,7 @@ CREATE INDEX fki_user_image_validation_account_id_fkey ON public.user_image_vali
 
 
 --
--- TOC entry 4014 (class 1259 OID 5773620)
+-- TOC entry 4021 (class 1259 OID 6931117)
 -- Name: image_annotation_coverage_image_id_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5834,7 +5835,7 @@ CREATE INDEX image_annotation_coverage_image_id_index ON public.image_annotation
 
 
 --
--- TOC entry 4008 (class 1259 OID 5773621)
+-- TOC entry 4015 (class 1259 OID 6931118)
 -- Name: image_annotation_image_id_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5842,7 +5843,7 @@ CREATE INDEX image_annotation_image_id_index ON public.image_annotation USING bt
 
 
 --
--- TOC entry 4173 (class 1259 OID 5774187)
+-- TOC entry 4037 (class 1259 OID 6931119)
 -- Name: image_annotation_suggestion_image_id_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5850,7 +5851,7 @@ CREATE INDEX image_annotation_suggestion_image_id_index ON public.image_annotati
 
 
 --
--- TOC entry 4176 (class 1259 OID 5774188)
+-- TOC entry 4040 (class 1259 OID 6931120)
 -- Name: image_annotation_suggestion_sys_period_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5858,7 +5859,7 @@ CREATE INDEX image_annotation_suggestion_sys_period_index ON public.image_annota
 
 
 --
--- TOC entry 4177 (class 1259 OID 5774189)
+-- TOC entry 4041 (class 1259 OID 6931121)
 -- Name: image_annotation_suggestion_uuid_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5866,7 +5867,7 @@ CREATE INDEX image_annotation_suggestion_uuid_index ON public.image_annotation_s
 
 
 --
--- TOC entry 4011 (class 1259 OID 5773622)
+-- TOC entry 4018 (class 1259 OID 6931122)
 -- Name: image_annotation_sys_period_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5874,7 +5875,7 @@ CREATE INDEX image_annotation_sys_period_index ON public.image_annotation USING
 
 
 --
--- TOC entry 4012 (class 1259 OID 5773623)
+-- TOC entry 4019 (class 1259 OID 6931123)
 -- Name: image_annotation_uuid_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5882,7 +5883,7 @@ CREATE INDEX image_annotation_uuid_index ON public.image_annotation USING btree
 
 
 --
--- TOC entry 4031 (class 1259 OID 5773624)
+-- TOC entry 4055 (class 1259 OID 6931124)
 -- Name: image_collection_image_image_id_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5890,7 +5891,7 @@ CREATE INDEX image_collection_image_image_id_index ON public.image_collection_im
 
 
 --
--- TOC entry 4034 (class 1259 OID 5773625)
+-- TOC entry 4058 (class 1259 OID 6931125)
 -- Name: image_collection_image_user_image_collection_id_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5898,7 +5899,7 @@ CREATE INDEX image_collection_image_user_image_collection_id_index ON public.ima
 
 
 --
--- TOC entry 4038 (class 1259 OID 5773626)
+-- TOC entry 4062 (class 1259 OID 6931126)
 -- Name: image_description_image_id_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5906,7 +5907,7 @@ CREATE INDEX image_description_image_id_index ON public.image_description USING
 
 
 --
--- TOC entry 4039 (class 1259 OID 5773627)
+-- TOC entry 4063 (class 1259 OID 6931127)
 -- Name: image_description_state_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5914,7 +5915,7 @@ CREATE INDEX image_description_state_index ON public.image_description USING btr
 
 
 --
--- TOC entry 4040 (class 1259 OID 5773628)
+-- TOC entry 4064 (class 1259 OID 6931128)
 -- Name: image_description_sys_period_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5922,7 +5923,7 @@ CREATE INDEX image_description_sys_period_index ON public.image_description USIN
 
 
 --
--- TOC entry 3995 (class 1259 OID 5773629)
+-- TOC entry 4002 (class 1259 OID 6931129)
 -- Name: image_hash_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5930,7 +5931,7 @@ CREATE INDEX image_hash_index ON public.image USING btree (hash);
 
 
 --
--- TOC entry 4000 (class 1259 OID 5773630)
+-- TOC entry 4007 (class 1259 OID 6931130)
 -- Name: image_image_provider_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5938,7 +5939,7 @@ CREATE INDEX image_image_provider_index ON public.image USING btree (image_provi
 
 
 --
--- TOC entry 4001 (class 1259 OID 5773631)
+-- TOC entry 4008 (class 1259 OID 6931131)
 -- Name: image_key_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5946,7 +5947,7 @@ CREATE INDEX image_key_index ON public.image USING btree (key);
 
 
 --
--- TOC entry 4004 (class 1259 OID 5773632)
+-- TOC entry 4011 (class 1259 OID 6931132)
 -- Name: image_unlocked_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5954,7 +5955,7 @@ CREATE INDEX image_unlocked_index ON public.image USING btree (unlocked);
 
 
 --
--- TOC entry 4074 (class 1259 OID 5773633)
+-- TOC entry 4098 (class 1259 OID 6931133)
 -- Name: image_validation_image_id_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5962,7 +5963,7 @@ CREATE INDEX image_validation_image_id_index ON public.image_validation USING bt
 
 
 --
--- TOC entry 4077 (class 1259 OID 5773634)
+-- TOC entry 4101 (class 1259 OID 6931134)
 -- Name: image_validation_label_id_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5970,7 +5971,7 @@ CREATE INDEX image_validation_label_id_index ON public.image_validation USING bt
 
 
 --
--- TOC entry 4078 (class 1259 OID 5773635)
+-- TOC entry 4102 (class 1259 OID 6931135)
 -- Name: image_validation_sys_period_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5978,7 +5979,7 @@ CREATE INDEX image_validation_sys_period_index ON public.image_validation USING
 
 
 --
--- TOC entry 4089 (class 1259 OID 5773636)
+-- TOC entry 4113 (class 1259 OID 6931136)
 -- Name: label_label_type_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5986,7 +5987,7 @@ CREATE INDEX label_label_type_index ON public.label USING btree (label_type);
 
 
 --
--- TOC entry 4143 (class 1259 OID 5773637)
+-- TOC entry 4167 (class 1259 OID 6931137)
 -- Name: user_image_account_id_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -5994,7 +5995,7 @@ CREATE INDEX user_image_account_id_index ON public.user_image USING btree (accou
 
 
 --
--- TOC entry 4152 (class 1259 OID 5773638)
+-- TOC entry 4180 (class 1259 OID 6931138)
 -- Name: user_image_collection_account_id_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -6002,7 +6003,7 @@ CREATE INDEX user_image_collection_account_id_index ON public.user_image_collect
 
 
 --
--- TOC entry 4157 (class 1259 OID 5773639)
+-- TOC entry 4185 (class 1259 OID 6931139)
 -- Name: user_image_collection_name_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -6010,7 +6011,7 @@ CREATE INDEX user_image_collection_name_index ON public.user_image_collection US
 
 
 --
--- TOC entry 4146 (class 1259 OID 5773640)
+-- TOC entry 4170 (class 1259 OID 6931140)
 -- Name: user_image_image_id_index; Type: INDEX; Schema: public; Owner: monkey
 --
 
@@ -6018,7 +6019,7 @@ CREATE INDEX user_image_image_id_index ON public.user_image USING btree (image_i
 
 
 --
--- TOC entry 4256 (class 2620 OID 5773641)
+-- TOC entry 4256 (class 2620 OID 6931141)
 -- Name: image_annotation_refinement image_annotation_refinement_versioning_trigger; Type: TRIGGER; Schema: public; Owner: monkey
 --
 
@@ -6026,7 +6027,7 @@ CREATE TRIGGER image_annotation_refinement_versioning_trigger BEFORE INSERT OR D
 
 
 --
--- TOC entry 4260 (class 2620 OID 5774498)
+-- TOC entry 4258 (class 2620 OID 6931142)
 -- Name: image_annotation_suggestion_refinement image_annotation_suggestion_refinement_versioning_trigger; Type: TRIGGER; Schema: public; Owner: monkey
 --
 
@@ -6034,7 +6035,7 @@ CREATE TRIGGER image_annotation_suggestion_refinement_versioning_trigger BEFORE
 
 
 --
--- TOC entry 4259 (class 2620 OID 5774196)
+-- TOC entry 4257 (class 2620 OID 6931143)
 -- Name: image_annotation_suggestion image_annotation_suggestion_versioning_trigger; Type: TRIGGER; Schema: public; Owner: monkey
 --
 
@@ -6042,7 +6043,7 @@ CREATE TRIGGER image_annotation_suggestion_versioning_trigger BEFORE INSERT OR D
 
 
 --
--- TOC entry 4255 (class 2620 OID 5773642)
+-- TOC entry 4255 (class 2620 OID 6931144)
 -- Name: image_annotation image_annotation_versioning_trigger; Type: TRIGGER; Schema: public; Owner: monkey
 --
 
@@ -6050,7 +6051,7 @@ CREATE TRIGGER image_annotation_versioning_trigger BEFORE INSERT OR DELETE OR UP
 
 
 --
--- TOC entry 4257 (class 2620 OID 5773643)
+-- TOC entry 4259 (class 2620 OID 6931145)
 -- Name: image_description image_description_versioning_trigger; Type: TRIGGER; Schema: public; Owner: monkey
 --
 
@@ -6058,7 +6059,7 @@ CREATE TRIGGER image_description_versioning_trigger BEFORE INSERT OR DELETE OR U
 
 
 --
--- TOC entry 4258 (class 2620 OID 5773644)
+-- TOC entry 4260 (class 2620 OID 6931146)
 -- Name: image_validation image_validation_versioning_trigger; Type: TRIGGER; Schema: public; Owner: monkey
 --
 
@@ -6066,7 +6067,7 @@ CREATE TRIGGER image_validation_versioning_trigger BEFORE INSERT OR DELETE OR UP
 
 
 --
--- TOC entry 4198 (class 2606 OID 5773645)
+-- TOC entry 4198 (class 2606 OID 6931147)
 -- Name: access_token access_token_user_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6075,7 +6076,7 @@ ALTER TABLE ONLY public.access_token
 
 
 --
--- TOC entry 4199 (class 2606 OID 5773650)
+-- TOC entry 4199 (class 2606 OID 6931152)
 -- Name: account_permission account_permission_account_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6084,7 +6085,7 @@ ALTER TABLE ONLY public.account_permission
 
 
 --
--- TOC entry 4200 (class 2606 OID 5773655)
+-- TOC entry 4200 (class 2606 OID 6931157)
 -- Name: annotation_data annotation_data_annotation_type_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6093,7 +6094,7 @@ ALTER TABLE ONLY public.annotation_data
 
 
 --
--- TOC entry 4201 (class 2606 OID 5773660)
+-- TOC entry 4201 (class 2606 OID 6931162)
 -- Name: annotation_data annotation_data_image_annotation_revision_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6102,7 +6103,7 @@ ALTER TABLE ONLY public.annotation_data
 
 
 --
--- TOC entry 4248 (class 2606 OID 5774254)
+-- TOC entry 4203 (class 2606 OID 6931167)
 -- Name: annotation_suggestion_data annotation_suggestion_data_annotation_type_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6111,7 +6112,7 @@ ALTER TABLE ONLY public.annotation_suggestion_data
 
 
 --
--- TOC entry 4249 (class 2606 OID 5774259)
+-- TOC entry 4204 (class 2606 OID 6931172)
 -- Name: annotation_suggestion_data annotation_suggestion_data_image_annotation_suggestion_revision; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6120,7 +6121,7 @@ ALTER TABLE ONLY public.annotation_suggestion_data
 
 
 --
--- TOC entry 4203 (class 2606 OID 5773665)
+-- TOC entry 4206 (class 2606 OID 6931177)
 -- Name: api_token api_token_account_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6129,7 +6130,7 @@ ALTER TABLE ONLY public.api_token
 
 
 --
--- TOC entry 4207 (class 2606 OID 5773670)
+-- TOC entry 4210 (class 2606 OID 6931182)
 -- Name: image_annotation_coverage image_annotation_coverage_image_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6138,7 +6139,7 @@ ALTER TABLE ONLY public.image_annotation_coverage
 
 
 --
--- TOC entry 4202 (class 2606 OID 5773675)
+-- TOC entry 4202 (class 2606 OID 6931187)
 -- Name: annotation_data image_annotation_data_annotation_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6147,7 +6148,7 @@ ALTER TABLE ONLY public.annotation_data
 
 
 --
--- TOC entry 4205 (class 2606 OID 5773680)
+-- TOC entry 4208 (class 2606 OID 6931192)
 -- Name: image_annotation image_annotation_image_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6156,7 +6157,7 @@ ALTER TABLE ONLY public.image_annotation
 
 
 --
--- TOC entry 4206 (class 2606 OID 5773685)
+-- TOC entry 4209 (class 2606 OID 6931197)
 -- Name: image_annotation image_annotation_label_id_key; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6165,7 +6166,7 @@ ALTER TABLE ONLY public.image_annotation
 
 
 --
--- TOC entry 4208 (class 2606 OID 5773690)
+-- TOC entry 4211 (class 2606 OID 6931202)
 -- Name: image_annotation_refinement image_annotation_refinement_annotation_data_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6174,7 +6175,7 @@ ALTER TABLE ONLY public.image_annotation_refinement
 
 
 --
--- TOC entry 4209 (class 2606 OID 5773695)
+-- TOC entry 4212 (class 2606 OID 6931207)
 -- Name: image_annotation_refinement image_annotation_refinement_label_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6183,7 +6184,7 @@ ALTER TABLE ONLY public.image_annotation_refinement
 
 
 --
--- TOC entry 4210 (class 2606 OID 5773700)
+-- TOC entry 4213 (class 2606 OID 6931212)
 -- Name: image_annotation_revision image_annotation_revision_image_annotation_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6192,7 +6193,7 @@ ALTER TABLE ONLY public.image_annotation_revision
 
 
 --
--- TOC entry 4250 (class 2606 OID 5774264)
+-- TOC entry 4205 (class 2606 OID 6931217)
 -- Name: annotation_suggestion_data image_annotation_suggestion_data_annotation_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6201,7 +6202,7 @@ ALTER TABLE ONLY public.annotation_suggestion_data
 
 
 --
--- TOC entry 4245 (class 2606 OID 5774176)
+-- TOC entry 4214 (class 2606 OID 6931222)
 -- Name: image_annotation_suggestion image_annotation_suggestion_image_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6210,7 +6211,7 @@ ALTER TABLE ONLY public.image_annotation_suggestion
 
 
 --
--- TOC entry 4246 (class 2606 OID 5774181)
+-- TOC entry 4215 (class 2606 OID 6931227)
 -- Name: image_annotation_suggestion image_annotation_suggestion_label_suggestion_id_label_suggestio; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6219,7 +6220,7 @@ ALTER TABLE ONLY public.image_annotation_suggestion
 
 
 --
--- TOC entry 4253 (class 2606 OID 5774480)
+-- TOC entry 4216 (class 2606 OID 6931232)
 -- Name: image_annotation_suggestion_refinement image_annotation_suggestion_refinement_annotation_suggestion_da; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6228,7 +6229,7 @@ ALTER TABLE ONLY public.image_annotation_suggestion_refinement
 
 
 --
--- TOC entry 4254 (class 2606 OID 5774485)
+-- TOC entry 4217 (class 2606 OID 6931237)
 -- Name: image_annotation_suggestion_refinement image_annotation_suggestion_refinement_label_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6237,7 +6238,7 @@ ALTER TABLE ONLY public.image_annotation_suggestion_refinement
 
 
 --
--- TOC entry 4247 (class 2606 OID 5774205)
+-- TOC entry 4218 (class 2606 OID 6931242)
 -- Name: image_annotation_suggestion_revision image_annotation_suggestion_revision_image_annotation_suggestio; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6246,7 +6247,7 @@ ALTER TABLE ONLY public.image_annotation_suggestion_revision
 
 
 --
--- TOC entry 4211 (class 2606 OID 5773705)
+-- TOC entry 4219 (class 2606 OID 6931247)
 -- Name: image_collection_image image_collection_image_image_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6255,7 +6256,7 @@ ALTER TABLE ONLY public.image_collection_image
 
 
 --
--- TOC entry 4212 (class 2606 OID 5773710)
+-- TOC entry 4220 (class 2606 OID 6931252)
 -- Name: image_collection_image image_collection_image_user_image_collection_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6264,7 +6265,7 @@ ALTER TABLE ONLY public.image_collection_image
 
 
 --
--- TOC entry 4213 (class 2606 OID 5773715)
+-- TOC entry 4221 (class 2606 OID 6931257)
 -- Name: image_description image_description_image_id_image_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6273,7 +6274,7 @@ ALTER TABLE ONLY public.image_description
 
 
 --
--- TOC entry 4214 (class 2606 OID 5773720)
+-- TOC entry 4222 (class 2606 OID 6931262)
 -- Name: image_description image_description_language_language_id; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6282,7 +6283,7 @@ ALTER TABLE ONLY public.image_description
 
 
 --
--- TOC entry 4215 (class 2606 OID 5773725)
+-- TOC entry 4223 (class 2606 OID 6931267)
 -- Name: image_description image_description_processed_by_account_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6291,7 +6292,7 @@ ALTER TABLE ONLY public.image_description
 
 
 --
--- TOC entry 4204 (class 2606 OID 5773730)
+-- TOC entry 4207 (class 2606 OID 6931272)
 -- Name: image image_image_provider_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6300,7 +6301,7 @@ ALTER TABLE ONLY public.image
 
 
 --
--- TOC entry 4216 (class 2606 OID 5773735)
+-- TOC entry 4224 (class 2606 OID 6931277)
 -- Name: image_label_suggestion image_label_suggestion_image_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6309,7 +6310,7 @@ ALTER TABLE ONLY public.image_label_suggestion
 
 
 --
--- TOC entry 4217 (class 2606 OID 5773740)
+-- TOC entry 4225 (class 2606 OID 6931282)
 -- Name: image_label_suggestion image_label_suggestion_label_suggestion_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6318,7 +6319,7 @@ ALTER TABLE ONLY public.image_label_suggestion
 
 
 --
--- TOC entry 4218 (class 2606 OID 5773745)
+-- TOC entry 4226 (class 2606 OID 6931287)
 -- Name: image_quarantine image_quarantine_image_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6327,7 +6328,7 @@ ALTER TABLE ONLY public.image_quarantine
 
 
 --
--- TOC entry 4219 (class 2606 OID 5773750)
+-- TOC entry 4227 (class 2606 OID 6931292)
 -- Name: image_report image_report_image_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6336,7 +6337,7 @@ ALTER TABLE ONLY public.image_report
 
 
 --
--- TOC entry 4220 (class 2606 OID 5773755)
+-- TOC entry 4228 (class 2606 OID 6931297)
 -- Name: image_source image_source_image_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6345,7 +6346,7 @@ ALTER TABLE ONLY public.image_source
 
 
 --
--- TOC entry 4221 (class 2606 OID 5773760)
+-- TOC entry 4229 (class 2606 OID 6931302)
 -- Name: image_validation image_validation_image_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6354,7 +6355,7 @@ ALTER TABLE ONLY public.image_validation
 
 
 --
--- TOC entry 4222 (class 2606 OID 5773765)
+-- TOC entry 4230 (class 2606 OID 6931307)
 -- Name: image_validation image_validation_label_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6363,7 +6364,7 @@ ALTER TABLE ONLY public.image_validation
 
 
 --
--- TOC entry 4223 (class 2606 OID 5773770)
+-- TOC entry 4231 (class 2606 OID 6931312)
 -- Name: image_validation_source image_validation_source_image_source_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6372,7 +6373,7 @@ ALTER TABLE ONLY public.image_validation_source
 
 
 --
--- TOC entry 4224 (class 2606 OID 5773775)
+-- TOC entry 4232 (class 2606 OID 6931317)
 -- Name: image_validation_source image_validation_source_image_validation_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6381,7 +6382,7 @@ ALTER TABLE ONLY public.image_validation_source
 
 
 --
--- TOC entry 4225 (class 2606 OID 5773780)
+-- TOC entry 4233 (class 2606 OID 6931322)
 -- Name: imagehunt_task imagehunt_task_image_validation_id_image_validation_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6390,7 +6391,7 @@ ALTER TABLE ONLY public.imagehunt_task
 
 
 --
--- TOC entry 4227 (class 2606 OID 5773785)
+-- TOC entry 4235 (class 2606 OID 6931327)
 -- Name: label_accessor label_accessor_label_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6399,7 +6400,7 @@ ALTER TABLE ONLY public.label_accessor
 
 
 --
--- TOC entry 4228 (class 2606 OID 5773790)
+-- TOC entry 4236 (class 2606 OID 6931332)
 -- Name: label_example label_example_label_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6408,7 +6409,7 @@ ALTER TABLE ONLY public.label_example
 
 
 --
--- TOC entry 4226 (class 2606 OID 5773795)
+-- TOC entry 4234 (class 2606 OID 6931337)
 -- Name: label label_parent_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6417,7 +6418,7 @@ ALTER TABLE ONLY public.label
 
 
 --
--- TOC entry 4229 (class 2606 OID 5773800)
+-- TOC entry 4237 (class 2606 OID 6931342)
 -- Name: label_suggestion label_suggestion_proposed_by_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6426,7 +6427,7 @@ ALTER TABLE ONLY public.label_suggestion
 
 
 --
--- TOC entry 4230 (class 2606 OID 5773805)
+-- TOC entry 4238 (class 2606 OID 6931347)
 -- Name: quiz_answer quiz_label_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6435,7 +6436,7 @@ ALTER TABLE ONLY public.quiz_answer
 
 
 --
--- TOC entry 4232 (class 2606 OID 5773810)
+-- TOC entry 4240 (class 2606 OID 6931352)
 -- Name: quiz_question quiz_question_refines_label_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6444,7 +6445,7 @@ ALTER TABLE ONLY public.quiz_question
 
 
 --
--- TOC entry 4231 (class 2606 OID 5773815)
+-- TOC entry 4239 (class 2606 OID 6931357)
 -- Name: quiz_answer quiz_quiz_question_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6453,7 +6454,7 @@ ALTER TABLE ONLY public.quiz_answer
 
 
 --
--- TOC entry 4233 (class 2606 OID 5773820)
+-- TOC entry 4241 (class 2606 OID 6931362)
 -- Name: trending_label_bot_task trending_label_suggestion_id_trending_label_suggestion_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6462,7 +6463,7 @@ ALTER TABLE ONLY public.trending_label_bot_task
 
 
 --
--- TOC entry 4234 (class 2606 OID 5773825)
+-- TOC entry 4242 (class 2606 OID 6931367)
 -- Name: trending_label_suggestion trending_label_suggestion_label_suggestion_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6471,7 +6472,7 @@ ALTER TABLE ONLY public.trending_label_suggestion
 
 
 --
--- TOC entry 4235 (class 2606 OID 5773830)
+-- TOC entry 4243 (class 2606 OID 6931372)
 -- Name: trending_label_suggestion trending_label_suggestion_productive_label_id_label_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6480,7 +6481,7 @@ ALTER TABLE ONLY public.trending_label_suggestion
 
 
 --
--- TOC entry 4236 (class 2606 OID 5773835)
+-- TOC entry 4244 (class 2606 OID 6931377)
 -- Name: user_annotation_blacklist user_annotation_blacklist_account_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6489,7 +6490,7 @@ ALTER TABLE ONLY public.user_annotation_blacklist
 
 
 --
--- TOC entry 4237 (class 2606 OID 5773840)
+-- TOC entry 4245 (class 2606 OID 6931382)
 -- Name: user_annotation_blacklist user_annotation_blacklist_image_validation_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6498,7 +6499,7 @@ ALTER TABLE ONLY public.user_annotation_blacklist
 
 
 --
--- TOC entry 4238 (class 2606 OID 5773845)
+-- TOC entry 4246 (class 2606 OID 6931387)
 -- Name: user_image user_image_account_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6507,7 +6508,7 @@ ALTER TABLE ONLY public.user_image
 
 
 --
--- TOC entry 4240 (class 2606 OID 5773850)
+-- TOC entry 4248 (class 2606 OID 6931392)
 -- Name: user_image_annotation user_image_annotation_account_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6516,7 +6517,7 @@ ALTER TABLE ONLY public.user_image_annotation
 
 
 --
--- TOC entry 4241 (class 2606 OID 5773855)
+-- TOC entry 4249 (class 2606 OID 6931397)
 -- Name: user_image_annotation user_image_annotation_image_annotation_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6525,7 +6526,7 @@ ALTER TABLE ONLY public.user_image_annotation
 
 
 --
--- TOC entry 4251 (class 2606 OID 5774280)
+-- TOC entry 4250 (class 2606 OID 6931402)
 -- Name: user_image_annotation_suggestion user_image_annotation_suggestion_account_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6534,7 +6535,7 @@ ALTER TABLE ONLY public.user_image_annotation_suggestion
 
 
 --
--- TOC entry 4252 (class 2606 OID 5774285)
+-- TOC entry 4251 (class 2606 OID 6931407)
 -- Name: user_image_annotation_suggestion user_image_annotation_suggestion_image_annotation_suggestion_id; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6543,7 +6544,7 @@ ALTER TABLE ONLY public.user_image_annotation_suggestion
 
 
 --
--- TOC entry 4242 (class 2606 OID 5773860)
+-- TOC entry 4252 (class 2606 OID 6931412)
 -- Name: user_image_collection user_image_collection_account_id_account_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6552,7 +6553,7 @@ ALTER TABLE ONLY public.user_image_collection
 
 
 --
--- TOC entry 4239 (class 2606 OID 5773865)
+-- TOC entry 4247 (class 2606 OID 6931417)
 -- Name: user_image user_image_image_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6561,7 +6562,7 @@ ALTER TABLE ONLY public.user_image
 
 
 --
--- TOC entry 4243 (class 2606 OID 5773870)
+-- TOC entry 4253 (class 2606 OID 6931422)
 -- Name: user_image_validation user_image_validation_acccount_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6570,7 +6571,7 @@ ALTER TABLE ONLY public.user_image_validation
 
 
 --
--- TOC entry 4244 (class 2606 OID 5773875)
+-- TOC entry 4254 (class 2606 OID 6931427)
 -- Name: user_image_validation user_image_validation_image_validation_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: monkey
 --
 
@@ -6588,7 +6589,7 @@ REVOKE ALL ON SCHEMA public FROM postgres;
 GRANT ALL ON SCHEMA public TO monkey;
 
 
--- Completed on 2019-10-05 19:07:03 CEST
+-- Completed on 2019-12-05 20:42:26 CET
 
 --
 -- PostgreSQL database dump complete
diff --git a/html/templates/404.html b/html/templates/404.html
index 0b1e96b1..a37819e2 100644
--- a/html/templates/404.html
+++ b/html/templates/404.html
@@ -11,10 +11,10 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="css/common.css"/>
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
 
   <style>
     .outer {
@@ -55,4 +55,4 @@ <h1>404</h1>
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/html/templates/annotate.html b/html/templates/annotate.html
index 9e1b9ab5..69e1e5b5 100644
--- a/html/templates/annotate.html
+++ b/html/templates/annotate.html
@@ -11,32 +11,33 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="css/common.css"/>
-  <link rel="stylesheet" href="css/common_sub.css"/>
-  <script src="js/common.js"></script> 
-  <script src="js/fabric.min.js"></script>
-  <script src="js/fabric_helper.js?v=15"></script>
-  <script src="js/fingerprint2.min.js"></script>
-  <script src="js/lodash.core.min.js"></script>
-  <script src="js/annotate.js?v=24"></script>
-  <script src="js/simplify.js"></script>
-  <script src="js/justified-layout.min.js"></script>
-  <script src="js/infinitescroll.js?v=2"></script>
-  <script src="js/jquery-ui.min.js"></script>
-  <link rel="stylesheet" href="css/jquery-ui.css"/>
-  <link rel="stylesheet" href="css/spinner/spinners/3-wave.css"/>
-  <script src="js/mousetrap.min.js"></script>
-  <script src="js/huebee.min.js"></script>
-  <link rel="stylesheet" href="css/huebee.min.css"/>
-  <script src="js/contextjs/context.js"></script>
-  <script src="js/sentry/sentry.min.js"></script>
-  <script src="js/imagemonkey/api.js?v=11"></script>
-  <script src="js/imagemonkey/views/annotation.min.js?v=9"></script>
-  <script src="js/imagemonkey/misc/autocompletion.js?v=2"></script>
-  <link rel="stylesheet" href="css/contextjs/context.standalone.css">
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="js/common.js?v={{ .assetVersion }}"></script> 
+  <script src="js/fabric.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/fabric_helper.js?v={{ .assetVersion }}"></script>
+  <script src="js/fingerprint2.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/lodash.core.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/annotate.js?v={{ .assetVersion }}"></script>
+  <script src="js/simplify.js?v={{ .assetVersion }}"></script>
+  <script src="js/justified-layout.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/infinitescroll.js?v={{ .assetVersion }}"></script>
+  <script src="js/jquery-ui.min.js?v={{ .assetVersion }}"></script>
+  <link rel="stylesheet" href="css/jquery-ui.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/spinner/spinners/3-wave.css?v={{ .assetVersion }}"/>
+  <script src="js/mousetrap.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/huebee.min.js?v={{ .assetVersion }}"></script>
+  <link rel="stylesheet" href="css/huebee.min.css?v={{ .assetVersion }}"/>
+  <script src="js/contextjs/context.js?v={{ .assetVersion }}"></script>
+  <script src="js/sentry/sentry.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/imagemonkey/api.js?v={{ .assetVersion }}"></script>
+  <script src="js/imagemonkey/views/annotation.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/imagemonkey/misc/autocompletion.js?v={{ .assetVersion }}"></script>
+  <link rel="stylesheet" href="css/contextjs/context.standalone.css?v={{ .assetVersion }}">
+  <link rel="stylesheet" href="css/balloon/balloon.min.css?v={{ .assetVersion }}">
 
   <style>
 
diff --git a/html/templates/donate.html b/html/templates/donate.html
index e2acde87..a6d508da 100644
--- a/html/templates/donate.html
+++ b/html/templates/donate.html
@@ -12,17 +12,17 @@
     <!-- Site Properties -->
     <title>{{ .title }}</title>
 
-    <link rel="stylesheet" href="css/semantic.min.css" />
-    <script src="js/jquery.min.js"></script>
-    <script src="js/semantic.min.js"></script>
-    <link rel="stylesheet" href="css/common.css" />
-    <link rel="stylesheet" href="css/common_sub.css" />
-    <script src="js/common.js?v=1"></script>
-    <link rel="stylesheet" href="css/common_sub.css" />
-    <script src="js/dropzone.js"></script>
-    <link rel="stylesheet" href="css/dropzone.css">
-    <script src="js/fingerprint2.min.js"></script>
-	<script src="js/imagemonkey/api.js?v=1"></script>
+    <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}" />
+    <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+    <script src="js/semantic.min.js?v={{ .assetVersion }}"></script>
+    <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}" />
+    <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}" />
+    <script src="js/common.js?v={{ .assetVersion }}"></script>
+    <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}" />
+    <script src="js/dropzone.js?v={{ .assetVersion }}"></script>
+    <link rel="stylesheet" href="css/dropzone.css?v={{ .assetVersion }}">
+    <script src="js/fingerprint2.min.js?v={{ .assetVersion }}"></script>
+	<script src="js/imagemonkey/api.js?v={{ .assetVersion }}"></script>
 
 	<style>
 		.equal-width label{
diff --git a/html/templates/explore.html b/html/templates/explore.html
index 5f58b79e..6baa42ba 100644
--- a/html/templates/explore.html
+++ b/html/templates/explore.html
@@ -11,18 +11,18 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="css/common.css"/>
-  <link rel="stylesheet" href="css/common_sub.css"/>
-  <script src="js/common.js"></script> 
-  <script src="js/fabric.min.js"></script>
-  <script src="js/fabric_helper.js?v=5"></script>
-  <script src="js/justified-layout.min.js"></script>
-  <script src="js/infinitescroll.js"></script>
-  <script src="js/jquery-ui.min.js"></script>
-  <link rel="stylesheet" href="css/jquery-ui.css">
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="js/common.js?v={{ .assetVersion }}"></script> 
+  <script src="js/fabric.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/fabric_helper.js?v={{ .assetVersion }}"></script>
+  <script src="js/justified-layout.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/infinitescroll.js?v={{ .assetVersion }}"></script>
+  <script src="js/jquery-ui.min.js?v={{ .assetVersion }}"></script>
+  <link rel="stylesheet" href="css/jquery-ui.css?v={{ .assetVersion }}">
 
   <style>
   .justified {
@@ -398,4 +398,4 @@ <h2 class="ui center aligned header" id="browseShowDetailedTitle"></h2>
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/html/templates/graph.html b/html/templates/graph.html
index 4f2f2b47..6d9ae80a 100644
--- a/html/templates/graph.html
+++ b/html/templates/graph.html
@@ -11,19 +11,19 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/semantic.min.js"></script>  
-
-  <link rel="stylesheet" href="css/common.css"/>
-  <link rel="stylesheet" href="css/common_sub.css"/>
-  <script src="js/ace/ace.js"></script> 
-  <script src="js/ace/ext-language_tools.js"></script>
-  <script src="js/d3.v4.min.js"></script>
-  <script src="js/d3-selection-multi.v1.js"></script>
-  <script src="js/mousetrap.min.js"></script>
-  <script src="js/force-graph/force-graph.min.js"></script>
-
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script>  
+
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="js/ace/ace.js?v={{ .assetVersion }}"></script> 
+  <script src="js/ace/ext-language_tools.js?v={{ .assetVersion }}"></script>
+  <script src="js/d3.v4.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/d3-selection-multi.v1.js?v={{ .assetVersion }}"></script>
+  <script src="js/mousetrap.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/force-graph/force-graph.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/common.js?v={{ .assetVersion }}"></script>
   <style>
 	.tooltip {
 	  	position:absolute;
diff --git a/html/templates/image_unlock.html b/html/templates/image_unlock.html
index 878714a6..85b11bae 100644
--- a/html/templates/image_unlock.html
+++ b/html/templates/image_unlock.html
@@ -11,15 +11,15 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="/css/semantic.min.css"/>
-  <script src="/js/jquery.min.js"></script>
-  <script src="/js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="/css/common.css"/>
-  <link rel="stylesheet" href="/css/common_sub.css"/>
-  <script src="/js/common.js"></script> 
-  <link rel="stylesheet" href="css/spinner/spinners/3-wave.css"/>
-  <script src="js/infinitescroll.js?v=2"></script>
-  <script src="js/justified-layout.min.js"></script>
+  <link rel="stylesheet" href="/css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="/js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="/js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="/css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="/css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="/js/common.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/spinner/spinners/3-wave.css?v={{ .assetVersion }}"/>
+  <script src="js/infinitescroll.js?v={{ .assetVersion }}"></script>
+  <script src="js/justified-layout.min.js?v={{ .assetVersion }}"></script>
 
   <style>
   .justified {
@@ -462,4 +462,4 @@ <h1 class="ui header" id="labels"></h1>
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/html/templates/index.html b/html/templates/index.html
index 418e33b2..8094df90 100644
--- a/html/templates/index.html
+++ b/html/templates/index.html
@@ -11,15 +11,15 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="css/common.css"/>
-  <link rel="stylesheet" href="css/spinner/spinners/3-wave.css"/>
-  <script src="js/common.js"></script> 
-  <script src="js/chart.bundle.min.js"></script>
-  <script src="js/fabric.min.js"></script>
-  <script src="js/fabric_helper.js?v=5"></script>
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/spinner/spinners/3-wave.css?v={{ .assetVersion }}"/>
+  <script src="js/common.js?v={{ .assetVersion }}"></script> 
+  <script src="js/chart.bundle.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/fabric.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/fabric_helper.js?v={{ .assetVersion }}"></script>
 
   <style type="text/css">
     .canvas-container{margin: 0 auto;}
diff --git a/html/templates/label.html b/html/templates/label.html
index f13a509e..0651c8f1 100644
--- a/html/templates/label.html
+++ b/html/templates/label.html
@@ -11,31 +11,31 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/semantic.min.js"></script> 
-
-  <link rel="stylesheet" href="css/common.css"/>
-  <link rel="stylesheet" href="css/common_sub.css"/>
-  <script src="js/common.js?v=2"></script> 
-  <script src="js/label.js"></script>
-  <script src="js/jquery-ui.min.js"></script>
-  <link rel="stylesheet" href="css/jquery-ui.css">
-  <script src="js/justified-layout.min.js"></script>
-  <script src="js/mousetrap.min.js"></script>
-  <script src="js/mousetrap-record.min.js"></script>
-  <script src="js/settings.js?v=4"></script>
-  <script src="js/contextjs/context.js"></script>
-  <link rel="stylesheet" href="css/contextjs/context.standalone.css">
-  <script src="js/infinitescroll.js?v=2"></script>
-  <script src="js/fingerprint2.min.js"></script>
-  <link rel="stylesheet" href="css/balloon/balloon.min.css">
-  <script src="js/fabric.min.js"></script>
-  <script src="js/fabric_helper.js?v=12"></script>
-  <link rel="stylesheet" href="css/spinner/spinners/3-wave.css"/>
-  <script src="js/imagemonkey/api.js?v=3"></script>
-  <script src="js/sentry/sentry.min.js"></script>
-  <script src="js/imagemonkey/misc/autocompletion.js?v=1"></script>
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script> 
+
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="js/common.js?v={{ .assetVersion }}"></script> 
+  <script src="js/label.js?v={{ .assetVersion }}"></script>
+  <script src="js/jquery-ui.min.js?v={{ .assetVersion }}"></script>
+  <link rel="stylesheet" href="css/jquery-ui.css?v={{ .assetVersion }}">
+  <script src="js/justified-layout.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/mousetrap.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/mousetrap-record.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/settings.js?v={{ .assetVersion }}"></script>
+  <script src="js/contextjs/context.js?v={{ .assetVersion }}"></script>
+  <link rel="stylesheet" href="css/contextjs/context.standalone.css?v={{ .assetVersion }}">
+  <script src="js/infinitescroll.js?v={{ .assetVersion }}"></script>
+  <script src="js/fingerprint2.min.js?v={{ .assetVersion }}"></script>
+  <link rel="stylesheet" href="css/balloon/balloon.min.css?v={{ .assetVersion }}">
+  <script src="js/fabric.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/fabric_helper.js?v={{ .assetVersion }}"></script>
+  <link rel="stylesheet" href="css/spinner/spinners/3-wave.css?v={{ .assetVersion }}"/>
+  <script src="js/imagemonkey/api.js?v={{ .assetVersion }}"></script>
+  <script src="js/sentry/sentry.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/imagemonkey/misc/autocompletion.js?v={{ .assetVersion }}"></script>
 
   <style type="text/css">
     .canvas-container{margin: 0 auto;}
@@ -849,15 +849,6 @@
     .dropdown()
     ;
 
-
-    function split(val) {
-      return val.split( / \s*/ );
-    }
-    
-    function extractLast(term) {
-      return split(term).pop();
-    }
-
     function onAddLabelSuggestion() {
       var labels = $("#labelSuggestion").val();
       if(labels !== ""){
@@ -880,7 +871,8 @@
       }
     }
 
-    new AutoCompletion("#labelSuggestion", availableLabels);
+    if($("#labelSuggestion").length)
+	  new AutoCompletion("#labelSuggestion", availableLabels);
 
     try {
       //can fail in case someone uses uBlock origin or Co.
@@ -1124,11 +1116,11 @@ <h1></h1>
 {{ template "footer.html" .}}
   
 
-  <link href="css/shepherdjs/shepherd-theme-dark.css" rel="stylesheet">
-  <script src="js/popperjs/popper.min.js"></script>
-  <script src="js/shepherdjs/shepherd.js"></script>
+  <link href="css/shepherdjs/shepherd-theme-dark.css?v={{ .assetVersion }}" rel="stylesheet">
+  <script src="js/popperjs/popper.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/shepherdjs/shepherd.js?v={{ .assetVersion }}"></script>
   
 </body>
-<script src="js/intros/label_intro.js"></script>
+<script src="js/intros/label_intro.js?v={{ .assetVersion }}"></script>
 
 </html>
diff --git a/html/templates/labelrepository.html b/html/templates/labelrepository.html
index dfb0994b..28f2267b 100644
--- a/html/templates/labelrepository.html
+++ b/html/templates/labelrepository.html
@@ -11,15 +11,15 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="/css/semantic.min.css"/>
-  <script src="/js/jquery.min.js"></script>
-  <script src="/js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="/css/common.css"/>
-  <link rel="stylesheet" href="/css/common_sub.css"/>
-  <script src="/js/common.js"></script> 
-  <link rel="stylesheet" href="css/spinner/spinners/3-wave.css"/>
-  <script src="js/tablesort/tablesort.js"></script>
-  <script src="js/imagemonkey/api.js?v=2"></script>
+  <link rel="stylesheet" href="/css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="/js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="/js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="/css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="/css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="/js/common.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/spinner/spinners/3-wave.css?v={{ .assetVersion }}"/>
+  <script src="js/tablesort/tablesort.js?v={{ .assetVersion }}"></script>
+  <script src="js/imagemonkey/api.js?v={{ .assetVersion }}"></script>
 
   <script>
     var imageMonkeyApi = null; 
diff --git a/html/templates/libraries.html b/html/templates/libraries.html
index e72f29d0..789779bd 100644
--- a/html/templates/libraries.html
+++ b/html/templates/libraries.html
@@ -11,14 +11,14 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="css/common.css"/>
-  <link rel="stylesheet" href="css/common_sub.css"/>
-  <script src="js/common.js"></script> 
-  <script src="js/highlight.pack.js"></script>
-  <link rel="stylesheet" href="css/highlightjs/default.css"/>
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="js/common.js?v={{ .assetVersion }}"></script> 
+  <script src="js/highlight.pack.js?v={{ .assetVersion }}"></script>
+  <link rel="stylesheet" href="css/highlightjs/default.css?v={{ .assetVersion }}"/>
 
   <style>
     pre code.hljs {
@@ -137,4 +137,4 @@ <h1>P.S.</h1>
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/html/templates/login.html b/html/templates/login.html
index 17258a95..4d0d4d07 100644
--- a/html/templates/login.html
+++ b/html/templates/login.html
@@ -11,13 +11,13 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="css/common.css"/>
-  <link rel="stylesheet" href="css/common_sub.css"/>
-  <script src="js/common.js"></script> 
-  <link rel="stylesheet" href="css/common_sub.css"/>
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="js/common.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
 
   <script>
   $(document).ready(function(){
@@ -105,4 +105,4 @@ <h2 class="ui inverted header">
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/html/templates/maintenance.html b/html/templates/maintenance.html
index d23a2ecc..f101dee9 100644
--- a/html/templates/maintenance.html
+++ b/html/templates/maintenance.html
@@ -11,10 +11,10 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="css/common.css"/>
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
 
   <style>
     .outer {
@@ -55,4 +55,4 @@ <h1>We'll be back soon!</h1>
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/html/templates/menu.html b/html/templates/menu.html
index b01546a5..6745d28c 100644
--- a/html/templates/menu.html
+++ b/html/templates/menu.html
@@ -1,5 +1,5 @@
-<script src="/js/cookies.min.js"></script>
-<script src="/js/settings.js?v=1"></script>
+<script src="/js/cookies.min.js?v={{ .assetVersion }}"></script>
+<script src="/js/settings.js?v={{ .assetVersion }}"></script>
 
 <!-- Following Menu -->
 <!-- when changing here, change it also in pointing-menu.html-->
@@ -81,9 +81,14 @@
       </div>
     </div>
 
-    <a class="{{if (eq .activeMenuNr 10)}}active {{end}}item" href="/apps">Apps</a>
-    <a class="{{if (eq .activeMenuNr 11)}}active {{end}}item" href="/playground">Playground</a>
-    <a class="item" href="/blog">Blog</a>
+    <div class="ui dropdown item" id="moreMenuDropdown">
+      More<i class="dropdown icon"></i>
+      <div class="menu">
+        <div class="center aligned item" onclick="window.location='/apps';">Apps</div>
+        <div class="center aligned item" onclick="window.location='/blog';">Blog</div>
+        <div class="center aligned item" onclick="window.location='/playground';">Playground</div>
+      </div>
+    </div>
 
     {{if (eq .sessionInformation.LoggedIn false)}}
     <a class="{{if (eq .activeMenuNr 12)}}active {{end}}item" href="/login">Login</a>
@@ -123,5 +128,6 @@
     $('#validateMenuDropdown').dropdown();
     $('#annotateMenuDropdown').dropdown();
     $('#unifiedModeMenuDropdown').dropdown();
+    $('#moreMenuDropdown').dropdown();
   });
 </script>
diff --git a/html/templates/mobile.html b/html/templates/mobile.html
index 07c93fff..14dca7d3 100644
--- a/html/templates/mobile.html
+++ b/html/templates/mobile.html
@@ -11,12 +11,12 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="css/common.css"/>
-  <link rel="stylesheet" href="css/common_sub.css"/>
-  <script src="js/common.js"></script> 
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="js/common.js?v={{ .assetVersion }}"></script> 
 </head>
 <body>
 
@@ -82,4 +82,4 @@ <h1></h1>
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/html/templates/models.html b/html/templates/models.html
index 197ebcd7..7f0041a4 100644
--- a/html/templates/models.html
+++ b/html/templates/models.html
@@ -11,15 +11,15 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="/css/semantic.min.css"/>
-  <script src="/js/jquery.min.js"></script>
-  <script src="/js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="/css/common.css"/>
-  <link rel="stylesheet" href="/css/common_sub.css"/>
-  <script src="/js/common.js"></script> 
-  <link rel="stylesheet" href="/css/common_sub.css"/>
-  <link rel="stylesheet" href="css/spinner/spinners/3-wave.css"/>
-  <script src="js/tablesort/tablesort.js"></script>
+  <link rel="stylesheet" href="/css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="/js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="/js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="/css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="/css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="/js/common.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="/css/common_sub.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/spinner/spinners/3-wave.css?v={{ .assetVersion }}"/>
+  <script src="js/tablesort/tablesort.js?v={{ .assetVersion }}"></script>
 
   <script>
     var modelStatisticsDetails = {};
@@ -132,4 +132,4 @@ <h2 class="ui inverted header">
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/html/templates/moderation.html b/html/templates/moderation.html
index 05a7a7dd..ecac2f53 100644
--- a/html/templates/moderation.html
+++ b/html/templates/moderation.html
@@ -11,15 +11,15 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="/css/semantic.min.css"/>
-  <script src="/js/jquery.min.js"></script>
-  <script src="/js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="/css/common.css"/>
-  <link rel="stylesheet" href="/css/common_sub.css"/>
-  <script src="/js/common.js"></script> 
-  <link rel="stylesheet" href="/css/common_sub.css"/>
-  <link rel="stylesheet" href="css/spinner/spinners/3-wave.css"/>
-  <script src="js/tablesort/tablesort.js"></script>
+  <link rel="stylesheet" href="/css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="/js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="/js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="/css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="/css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="/js/common.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="/css/common_sub.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/spinner/spinners/3-wave.css?v={{ .assetVersion }}"/>
+  <script src="js/tablesort/tablesort.js?v={{ .assetVersion }}"></script>
 
   <script>
     var toBeDiscardedImageDescription = null;
@@ -201,4 +201,4 @@ <h2 class="ui inverted header">
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/html/templates/modules/annotation_browse_select_mode.html b/html/templates/modules/annotation_browse_select_mode.html
index b73e2444..b6b426c0 100644
--- a/html/templates/modules/annotation_browse_select_mode.html
+++ b/html/templates/modules/annotation_browse_select_mode.html
@@ -20,7 +20,7 @@
   var justifiedLayoutGeometry, imageGridData;
   var numOfLastFetchedImg = 0;
   var defaultBatchSize = 50;
-  var currentAnnotatedImageGridElement;
+  //var currentAnnotatedImageGridElement;
   var infiniteScroll = new InfiniteScroll(loadNextImagesInImageGrid, false);
   var browseAnnotationsOnlyMode = false;
   var imageGridCanvases = {};
@@ -87,12 +87,16 @@
     });
   }
 
-  function showBrowseAnnotationImageGrid() {
+  function showBrowseAnnotationImageGrid(annotatedEntriesIds = null) {
     //if the image grid gets shown again, the image in question was successfully annotated/blacklisted or marked
     //as non-annotatable. We now grey the image out and change the mouse cursor to default again.
 
-    $("#"+currentAnnotatedImageGridElement).addClass("grey-out");
-    $("#"+currentAnnotatedImageGridElement).css('cursor', 'default');
+    if(annotatedEntriesIds !== null) {
+      for(var i = 0; i < annotatedEntriesIds.length; i++) {
+        $("#"+annotatedEntriesIds[i]).addClass("grey-out");
+        $("#"+annotatedEntriesIds[i]).css('cursor', 'default');
+      }
+    }
 
     //show image grid and jump to scroll position that we were before
     $("#imageGrid").show();
@@ -125,7 +129,11 @@
       var justifiedLayout = require('justified-layout');
       justifiedLayoutGeometry = justifiedLayout(sizes, {
         "fullWidthBreakoutRowCadence": false,
-        "containerWidth": document.getElementById("imageGrid").clientWidth
+        "containerWidth": document.getElementById("imageGrid").clientWidth,
+        "boxSpacing": {
+          "horizontal": 10,
+          "vertical": 100
+        }
       });
 
       loadNextImagesInImageGrid();
@@ -182,7 +190,7 @@
       return;
 
     var validationId = $(elem).attr("data-validationid");
-    currentAnnotatedImageGridElement = $(elem).attr("id");
+    //currentAnnotatedImageGridElement = $(elem).attr("id");
     $("#annotationQuerySearchContainer").hide();
     infiniteScroll.pause();
     infiniteScroll.saveScrollPosition();
@@ -199,16 +207,18 @@
     annotationView.loadAnnotatedImage(annotationId, -1);
   }
 
-  function newImageItem(id, url, validationId, top, left, width, height){
-    var d = ('<div class="justified-layout-item" style="width: ' + width 
+  function newImageItem(id, url, validationId, top, left, width, height, tooltip) {
+    var d = ('<div class="justified-layout-item" data-balloon-visible data-balloon="' + tooltip 
+            + '" data-balloon-length="fit" data-balloon-pos="up" style="width: ' + width 
             +'px; height: ' + height + 'px; top: ' 
             + top  + 'px; left: ' +  left + 'px"><img id="' + id +'" src="' + url 
             + '" data-validationid="' + validationId +'" onclick="onImageGridItemClicked(this);" style="cursor: pointer;"></div>');
     return d;
   }
 
-  function newCanvasItem(id, url, validationId, top, left, width, height){
-    var d = ('<div class="justified-layout-item" style="width: ' + width 
+  function newCanvasItem(id, url, validationId, top, left, width, height, tooltip) {
+    var d = ('<div class="justified-layout-item" data-balloon-visible data-balloon="' + tooltip 
+            + '" data-balloon-length="fit" data-balloon-pos="up" style="width: ' + width 
             +'px; height: ' + height + 'px; top: ' 
             + top  + 'px; left: ' +  left + 'px"><canvas id="' + id +'"></canvas></div>');
     return d;
@@ -247,6 +257,16 @@
                                   + ((imageGridData[i]["image"]["unlocked"] === true) ? '?' : '&') + "width=" + 
                                   Math.round(justifiedLayoutGeometry.boxes[i].width, 0) + 
                                   "&height=" + Math.round(justifiedLayoutGeometry.boxes[i].height, 0);
+     
+      var tooltipText = '';
+      if(browseAnnotationsOnlyMode) {
+        if(imageGridData[i].validation.sublabel !== "")
+          tooltipText = escapeHtml(imageGridData[i].validation.sublabel) + "/" + escapeHtml(imageGridData[i].validation.label);
+        else
+          tooltipText = escapeHtml(imageGridData[i].validation.label);
+      }
+      else
+        tooltipText = escapeHtml(imageGridData[i].label.accessor);
       
       if(browseAnnotationsOnlyMode) {
         var itemId = imageGridData[i]["uuid"];
@@ -255,7 +275,7 @@
           annotationsScaleFactor = 1.0;
 
         item = newCanvasItem(itemId, url, imageGridData[i]["uuid"], justifiedLayoutGeometry.boxes[i].top, justifiedLayoutGeometry.boxes[i].left, 
-                              justifiedLayoutGeometry.boxes[i].width, justifiedLayoutGeometry.boxes[i].height);
+                              justifiedLayoutGeometry.boxes[i].width, justifiedLayoutGeometry.boxes[i].height, tooltipText);
 
         $("#imageGrid").append(item); 
 
@@ -274,9 +294,9 @@
           }
         }
 
-        var imageId = ("galleryItem" + i.toString());
-        item = newImageItem(imageId, url, imageGridData[i]["uuid"], justifiedLayoutGeometry.boxes[i].top, justifiedLayoutGeometry.boxes[i].left, 
-                              justifiedLayoutGeometry.boxes[i].width, justifiedLayoutGeometry.boxes[i].height);
+        var itemId = imageGridData[i]["uuid"];
+        item = newImageItem(itemId, url, imageGridData[i]["uuid"], justifiedLayoutGeometry.boxes[i].top, justifiedLayoutGeometry.boxes[i].left, 
+                              justifiedLayoutGeometry.boxes[i].width, justifiedLayoutGeometry.boxes[i].height, tooltipText);
         $("#imageGrid").append(item); 
       }
 
@@ -290,13 +310,6 @@
     $("#numberOfQueryResults").text(numberOfCurrentlyShownResults + "/" + numberOfQueryResults + " results shown");
   }
 
-  function split(val) {
-    return val.split( / \s*/ );
-  }
-  function extractLast(term) {
-    return split(term).pop();
-  }
-
   $(document).ready(function(){
     //change label text (label is defined in annotate.html)
     $("#label").text("Browse");
diff --git a/html/templates/modules/label_browse_select_mode.html b/html/templates/modules/label_browse_select_mode.html
index 40738d89..674e78cb 100644
--- a/html/templates/modules/label_browse_select_mode.html
+++ b/html/templates/modules/label_browse_select_mode.html
@@ -235,13 +235,6 @@
     $("#numberOfQueryResults").text(numberOfCurrentlyShownResults + "/" + numberOfQueryResults + " results shown");
   }
 
-  function split(val) {
-    return val.split( / \s*/ );
-  }
-  function extractLast(term) {
-    return split(term).pop();
-  }
-
   $(document).ready(function(){
     var availableLabels = [];
 
diff --git a/html/templates/modules/validate_browse_select_mode.html b/html/templates/modules/validate_browse_select_mode.html
index 406cf1f8..dfa093df 100644
--- a/html/templates/modules/validate_browse_select_mode.html
+++ b/html/templates/modules/validate_browse_select_mode.html
@@ -325,13 +325,6 @@
     $("#numberOfQueryResults").text(numberOfCurrentlyShownResults + "/" + numberOfQueryResults + " results shown");
   }
 
-  function split(val) {
-    return val.split( / \s*/ );
-  }
-  function extractLast(term) {
-    return split(term).pop();
-  }
-
   $(document).ready(function(){
     var availableLabels = [];
     var labelAccessors = {{ .labelAccessors }};
diff --git a/html/templates/playground.html b/html/templates/playground.html
index 6601d7b6..fab9edaf 100644
--- a/html/templates/playground.html
+++ b/html/templates/playground.html
@@ -11,16 +11,16 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
   <script src="js/semantic.min.js"></script> 
   <script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>
-  <link rel="stylesheet" href="css/common.css"/>
-  <link rel="stylesheet" href="css/common_sub.css"/>
-  <script src="js/common.js"></script> 
-  <link rel="stylesheet" href="css/common_sub.css"/>
-  <script src="js/dropzone.js"></script>
-  <link rel="stylesheet" href="css/dropzone.css">
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="js/common.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="js/dropzone.js?v={{ .assetVersion }}"></script>
+  <link rel="stylesheet" href="css/dropzone.css?v={{ .assetVersion }}">
 
   <script>
   $(document).ready(function(){
@@ -217,4 +217,4 @@ <h2 class="ui inverted header">
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/html/templates/pointing_menu.html b/html/templates/pointing_menu.html
index 47b4c3fb..2c1e62e3 100644
--- a/html/templates/pointing_menu.html
+++ b/html/templates/pointing_menu.html
@@ -77,10 +77,14 @@
     </div>
   </div>
 
-
-  <a class="{{if (eq .activeMenuNr 10)}}active {{end}}item" href="/apps">Apps</a>
-  <a class="{{if (eq .activeMenuNr 11)}}active {{end}}item" href="/playground">Playground</a>
-  <a class="item" href="/blog">Blog</a>
+  <div class="ui dropdown item" id="morePointingMenuDropdown">
+    More<i class="dropdown icon"></i>
+    <div class="menu">
+      <div class="center aligned item" onclick="window.location='/apps';">Apps</div>
+      <div class="center aligned item" onclick="window.location='/blog';">Blog</div>
+      <div class="center aligned item" onclick="window.location='/playground';">Playground</div>
+    </div>
+  </div>
 
   {{if (eq .sessionInformation.LoggedIn false)}}
   <a class="{{if (eq .activeMenuNr 12)}}active {{end}}item" href="/login">Login</a>
@@ -150,6 +154,7 @@
     $('#validatePointingMenuDropdown').dropdown();
     $('#annotatePointingMenuDropdown').dropdown();
     $('#unifiedModePointingMenuDropdown').dropdown();
+    $('#morePointingMenuDropdown').dropdown();
 
     function parseJwt(token){
       var base64Url = token.split('.')[1];
diff --git a/html/templates/privacy.html b/html/templates/privacy.html
new file mode 100644
index 00000000..8c53f7c7
--- /dev/null
+++ b/html/templates/privacy.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<html>
+<head>
+  {{ template "favicon.html" .}}
+  
+  <!-- Standard Meta -->
+  <meta charset="utf-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+
+  <!-- Site Properties -->
+  <title>{{ .title }}</title>
+  
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="js/common.js?v={{ .assetVersion }}"></script> 
+</head>
+<body>
+
+{{ template "menu.html" .}}
+
+<!-- Page Contents -->
+<div class="pusher">
+  <div class="ui inverted vertical masthead center aligned segment">
+  	{{ template "pointing_menu.html" .}}  
+  	<div class="ui text container">
+  		<h2 class="ui inverted header">
+        Privacy Policy
+      </h2>
+    </div>
+  </div>
+  <div class="ui vertical stripe segment">
+    <div class="ui text container">
+	   <b>Last updated: November, 2019</b> <br><br>
+	   This Privacy Policy governs the manner in which ImageMonkey collects, uses, maintains and discloses 
+	   information collected from users of the various ImageMonkey services, including
+	   the website, or applications such as "ImageMonkey - The Game" for Android. 
+	   When using any of our Services you consent to the collection, transfer, storage, 
+	   disclosure, and use of your information as described in this Privacy Policy. 
+	   <br> <br>
+	   We use your Personal Information for providing and improving the Service. 
+	   By using the Service, you agree to the collection and use of information in accordance with this policy.
+	   <br><br>
+	   Your information is controlled by ImageMonkey. Irrespective of which country you reside in 
+	   or supply information from, you authorize ImageMonkey to use your information in Austria, 
+	   and any other country where ImageMonkey operates. 
+	   <br><br>
+	   If you have any questions or comments about this Privacy Policy, please contact us at <b>info@imagemonkey.io</b>.
+
+
+		<h3 class="text-justify">Information Collection and Use</h3>
+            Users of ImageMonkey's services choose to interact with ImageMonkey in ways that may require ImageMonkey to gather personally-identifying information. The amount and type of information that ImageMonkey gathers depends on the nature of the interaction. For example, we ask users who sign up for an ImageMonkey account to provide a username and email address.
+            <br><br>
+
+			By using our services you acknowledge that the data that we collect (images, annotations, validations) will be 
+			backed up to <a href="https://archive.org">The internet archive</a> in regular intervals, as part of <a href="/public_backup">our backup</a>.
+
+			<br><br>
+			By uploading an image you acknowledge that you are the owner of the image and and that you are fine that the image will be available for everybody
+			to download under the <a href="https://creativecommons.org/publicdomain/zero/1.0/">CC0 license</a>. 
+
+			<br><br>
+            If you email us, we may keep your message, email address and contact information to respond to your request. 
+
+
+            <h3 class="text-justify">Accessing and Modifying Your Personal Information</h3>
+            We provide you with tools and account settings to access, correct, or modify the personal information you provided to us and associated with your account.
+            <br><br>
+            You can also permanently delete your ImageMonkey account. Contact us at <b>info@imagemonkey.io</b> with that request and your account will be deleted. That means the 
+            deletion of all public information related to your account. Some records of your account may remain temporarily in cache even after deletion. 
+            Non-public behavioral event logs used for analytic purposes may remain as well. <br><br>
+
+            Keep in mind that search engines and other third parties may still retain copies of your public information, 
+            like your user profile information, even after the information has been deleted from the ImageMonkey services.
+
+            <h3 class="text-justify">Links To Other Sites</h3>
+            Our Service may contain links to other sites that are not operated by us. If you click on a third party link, you will be directed to that third party's site. We strongly advise you to review the Privacy Policy of every site you visit. We have no control over, and assume no responsibility for the content, privacy policies or practices of any third party sites or services.
+
+            <h3 class="text-justify">Our Policy Towards Children</h3>
+            Protecting the privacy of the very young is especially important. For that reason, we never collect or 
+            maintain information at our Site from those we actually know are under 13, and no part of our website is 
+            structured to attract anyone under 13. If you become aware that your child has provided us 
+            with personal information without your consent, please contact us at <b>info@imagemonkey.io.</b> We will immediatelly
+            take steps and remove such information and terminate the childs's account.
+
+            <h3 class="text-justify">Changes to this Privacy Policy</h3>
+            ImageMonkey has the discretion to update this privacy policy at any time. When we do, we will notify you by
+			sending an email to the email address associated with your account.
+            We encourage Users to frequently check this page for any changes to stay informed about how we are helping 
+            to protect the personal information we collect. You acknowledge and agree that it is your responsibility to review 
+            this privacy policy periodically and become aware of modifications.
+            <br><br>
+            By using this Site, you signify your acceptance of this policy. If you do not agree to this policy, 
+            please do not use our Site. By continuing to access or use the Services after those changes become effective, 
+            you agree to be bound by the revised Privacy Policy.
+
+            <h3 class="text-justify">Contact</h3>
+            Thoughts or questions about this Privacy Policy? Contact us at <b>info@imagemonkey.io</b>.
+
+
+    </div>
+  </div>
+</div>
+  {{ template "footer.html" .}}
+</div>
+
+</body>
+
+</html>
diff --git a/html/templates/profile.html b/html/templates/profile.html
index dca70ce7..59527714 100644
--- a/html/templates/profile.html
+++ b/html/templates/profile.html
@@ -11,15 +11,15 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="/css/semantic.min.css"/>
-  <script src="/js/jquery.min.js"></script>
-  <script src="/js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="/css/common.css"/>
-  <link rel="stylesheet" href="/css/common_sub.css"/>
-  <script src="/js/common.js"></script> 
-  <link rel="stylesheet" href="/css/common_sub.css"/>
-  <script src="/js/chart.bundle.min.js"></script>
-  <link rel="stylesheet" href="/css/spinner/spinners/3-wave.css"/>
+  <link rel="stylesheet" href="/css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="/js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="/js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="/css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="/css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="/js/common.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="/css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="/js/chart.bundle.min.js?v={{ .assetVersion }}"></script>
+  <link rel="stylesheet" href="/css/spinner/spinners/3-wave.css?v={{ .assetVersion }}"/>
 
 
   <style>
diff --git a/html/templates/public_backup.html b/html/templates/public_backup.html
index db48f309..43343b01 100644
--- a/html/templates/public_backup.html
+++ b/html/templates/public_backup.html
@@ -11,13 +11,13 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="css/common.css"/>
-  <link rel="stylesheet" href="css/common_sub.css"/> 
-  <script src="/js/common.js"></script> 
-  <script src="js/tablesort/tablesort.js"></script>
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/> 
+  <script src="/js/common.js?v={{ .assetVersion }}"></script> 
+  <script src="js/tablesort/tablesort.js?v={{ .assetVersion }}"></script>
 
   <script type="text/javascript">
     $(document).ready(function(){
@@ -90,4 +90,4 @@ <h2 class="ui inverted header">
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/html/templates/quiz.html b/html/templates/quiz.html
index cc4a7060..963875d3 100644
--- a/html/templates/quiz.html
+++ b/html/templates/quiz.html
@@ -11,15 +11,15 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="css/common.css"/>
-  <link rel="stylesheet" href="css/common_sub.css"/>
-  <script src="js/common.js"></script> 
-  <script src="js/fabric.min.js"></script>
-  <script src="js/fabric_helper.js?v=2"></script>
-  <script src="js/fingerprint2.min.js"></script>
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="js/common.js?v={{ .assetVersion }}"></script> 
+  <script src="js/fabric.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/fabric_helper.js?v={{ .assetVersion }}"></script>
+  <script src="js/fingerprint2.min.js?v={{ .assetVersion }}"></script>
 
   <style>
     .canvas-container{
@@ -494,4 +494,4 @@ <h2></h2>
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/html/templates/refinement.html b/html/templates/refinement.html
index 86c5459a..cd541893 100644
--- a/html/templates/refinement.html
+++ b/html/templates/refinement.html
@@ -11,22 +11,22 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="css/common.css"/>
-  <link rel="stylesheet" href="css/common_sub.css"/>
-  <script src="js/common.js?v=2"></script> 
-  <script src="js/justified-layout.min.js"></script>
-  <script src="js/infinitescroll.js?v=2"></script>
-  <script src="js/fingerprint2.min.js"></script>
-  <script src="js/fabric.min.js"></script>
-  <script src="js/fabric_helper.js?v=11"></script>
-  <link rel="stylesheet" href="css/balloon/balloon.min.css">
-  <script src="js/jquery-ui.min.js"></script>
-  <link rel="stylesheet" href="css/jquery-ui.css">
-  <link rel="stylesheet" href="css/spinner/spinners/3-wave.css"/>
-  <script src="js/imagemonkey/misc/autocompletion.js?v=1"></script>
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="js/common.js?v={{ .assetVersion }}"></script> 
+  <script src="js/justified-layout.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/infinitescroll.js?v={{ .assetVersion }}"></script>
+  <script src="js/fingerprint2.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/fabric.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/fabric_helper.js?v={{ .assetVersion }}"></script>
+  <link rel="stylesheet" href="css/balloon/balloon.min.css?v={{ .assetVersion }}">
+  <script src="js/jquery-ui.min.js?v={{ .assetVersion }}"></script>
+  <link rel="stylesheet" href="css/jquery-ui.css?v={{ .assetVersion }}">
+  <link rel="stylesheet" href="css/spinner/spinners/3-wave.css?v={{ .assetVersion }}"/>
+  <script src="js/imagemonkey/misc/autocompletion.js?v={{ .assetVersion }}"></script>
 
   <style>
     .canvas-container{margin: 0 auto;}
diff --git a/html/templates/reset_password.html b/html/templates/reset_password.html
index c0803bd3..e9a60e4e 100644
--- a/html/templates/reset_password.html
+++ b/html/templates/reset_password.html
@@ -9,13 +9,13 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="css/common.css"/>
-  <link rel="stylesheet" href="css/common_sub.css"/>
-  <script src="js/common.js"></script> 
-  <link rel="stylesheet" href="css/common_sub.css"/>
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="js/common.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
 
   <script>
   $(document).ready(function(){
@@ -94,4 +94,4 @@ <h2 class="ui inverted header">
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/html/templates/signup.html b/html/templates/signup.html
index b3bac118..dd0cb979 100644
--- a/html/templates/signup.html
+++ b/html/templates/signup.html
@@ -11,13 +11,13 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="css/common.css"/>
-  <link rel="stylesheet" href="css/common_sub.css"/>
-  <script src="js/common.js"></script> 
-  <link rel="stylesheet" href="css/common_sub.css"/>
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="js/common.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
 
   <script>
   $(document).ready(function(){
@@ -220,4 +220,4 @@ <h1 class="ui center aligned header">Success</h1>
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/html/templates/statistics.html b/html/templates/statistics.html
index ef88411b..ea6f924a 100644
--- a/html/templates/statistics.html
+++ b/html/templates/statistics.html
@@ -11,17 +11,17 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="css/common.css"/>
-  <link rel="stylesheet" href="css/common_sub.css"/>
-  <script src="js/common.js"></script> 
-  <script src="js/dropzone.js"></script>
-  <link rel="stylesheet" href="css/dropzone.css">
-
-  <script src="js/chart.bundle.min.js"></script>
-  <script src="js/countries.js"></script>
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="js/common.js?v={{ .assetVersion }}"></script> 
+  <script src="js/dropzone.js?v={{ .assetVersion }}"></script>
+  <link rel="stylesheet" href="css/dropzone.css?v={{ .assetVersion }}">
+
+  <script src="js/chart.bundle.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/countries.js?v={{ .assetVersion }}"></script>
 
   <style type="text/css">
     .label {
@@ -632,4 +632,4 @@ <h3 class="ui center aligned header">Error Rate</h3>
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/html/templates/validate.html b/html/templates/validate.html
index 2bc60ffb..de7ab9ce 100644
--- a/html/templates/validate.html
+++ b/html/templates/validate.html
@@ -11,26 +11,26 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/jquery-ui.min.js"></script>
-  <link rel="stylesheet" href="css/jquery-ui.css">
-  <script src="js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="css/common.css"/>
-  <link rel="stylesheet" href="css/common_sub.css"/>
-  <script src="js/common.js"></script> 
-  <script src="js/dropzone.js"></script>
-  <link rel="stylesheet" href="css/dropzone.css">
-
-  <script src="js/mousetrap.min.js"></script>
-  <script src="js/fingerprint2.min.js"></script>
-  <script src="js/chart.bundle.min.js"></script>
-  <script src="js/poll.js"></script>
-  <script src="js/justified-layout.min.js"></script>
-  <script src="js/infinitescroll.js?v=2"></script>
-  <link rel="stylesheet" href="css/balloon/balloon.min.css">
-  <link rel="stylesheet" href="css/spinner/spinners/3-wave.css"/>
-  <script src="js/imagemonkey/misc/autocompletion.js?v=1"></script>
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/jquery-ui.min.js?v={{ .assetVersion }}"></script>
+  <link rel="stylesheet" href="css/jquery-ui.css?v={{ .assetVersion }}">
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="js/common.js?v={{ .assetVersion }}"></script> 
+  <script src="js/dropzone.js?v={{ .assetVersion }}"></script>
+  <link rel="stylesheet" href="css/dropzone.css?v={{ .assetVersion }}">
+
+  <script src="js/mousetrap.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/fingerprint2.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/chart.bundle.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/poll.js?v={{ .assetVersion }}"></script>
+  <script src="js/justified-layout.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/infinitescroll.js?v={{ .assetVersion }}"></script>
+  <link rel="stylesheet" href="css/balloon/balloon.min.css?v={{ .assetVersion }}">
+  <link rel="stylesheet" href="css/spinner/spinners/3-wave.css?v={{ .assetVersion }}"/>
+  <script src="js/imagemonkey/misc/autocompletion.js?v={{ .assetVersion }}"></script>
 
   <style>
   #validateDoneButton{
@@ -229,7 +229,7 @@ <h2 class="ui inverted header">What do you see?</h2>
    </div>
    {{ else }}
     <!--in case header of no header, include it here-->
-      <script src="/js/cookies.min.js"></script>
+      <script src="/js/cookies.min.js?v={{ .assetVersion }}"></script>
    {{ end }}
 
    <div class="ui stackable grid">
diff --git a/html/templates/validate_annotations.html b/html/templates/validate_annotations.html
index c1fa919a..73527084 100644
--- a/html/templates/validate_annotations.html
+++ b/html/templates/validate_annotations.html
@@ -11,17 +11,17 @@
   <!-- Site Properties -->
   <title>{{ .title }}</title>
   
-  <link rel="stylesheet" href="css/semantic.min.css"/>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/semantic.min.js"></script> 
-  <link rel="stylesheet" href="css/common.css"/>
-  <link rel="stylesheet" href="css/common_sub.css"/>
-  <script src="js/common.js"></script> 
-  <script src="js/fabric.min.js"></script>
-  <script src="js/fabric_helper.js?v=4"></script>
-  <script src="js/fingerprint2.min.js"></script>
-  <script src="js/chart.bundle.min.js"></script>
-  <script src="js/poll.js"></script>
+  <link rel="stylesheet" href="css/semantic.min.css?v={{ .assetVersion }}"/>
+  <script src="js/jquery.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/semantic.min.js?v={{ .assetVersion }}"></script> 
+  <link rel="stylesheet" href="css/common.css?v={{ .assetVersion }}"/>
+  <link rel="stylesheet" href="css/common_sub.css?v={{ .assetVersion }}"/>
+  <script src="js/common.js?v={{ .assetVersion }}"></script> 
+  <script src="js/fabric.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/fabric_helper.js?v={{ .assetVersion }}"></script>
+  <script src="js/fingerprint2.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/chart.bundle.min.js?v={{ .assetVersion }}"></script>
+  <script src="js/poll.js?v={{ .assetVersion }}"></script>
 
   <style>
     .canvas-container{margin: 0 auto;}
@@ -227,4 +227,4 @@ <h3></h3>
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/js/annotate.js b/js/annotate.js
index 459c653d..2939c0c0 100644
--- a/js/annotate.js
+++ b/js/annotate.js
@@ -1553,10 +1553,10 @@ var AnnotationSettings = (function () {
     $("#annotationPolygonVertexSizeInput").val(settings.getPolygonVertexSize());
   }
 
-  AnnotationSettings.prototype.loadPreferedAnnotationTool = function(annotator) {
+  AnnotationSettings.prototype.loadPreferedAnnotationTool = function(annotationView, annotator) {
     var preferedAnnotationTool = localStorage.getItem("preferedAnnotationTool");
     if((preferedAnnotationTool === "Rectangle") || (preferedAnnotationTool === "Circle") || (preferedAnnotationTool === "Polygon")){
-      changeMenuItem(preferedAnnotationTool);
+      annotationView.changeMenuItem(preferedAnnotationTool);
       annotator.setShape(preferedAnnotationTool);
     }
   }
diff --git a/js/imagemonkey/misc/autocompletion.js b/js/imagemonkey/misc/autocompletion.js
index 4afcfbd6..2c0a11de 100644
--- a/js/imagemonkey/misc/autocompletion.js
+++ b/js/imagemonkey/misc/autocompletion.js
@@ -1,5 +1,14 @@
 var AutoCompletion = (function() {
+    function split(val) {
+      return val.split( / \s*/ );
+    }
+	
+    function extractLast(term) {
+      return split(term).pop();
+    }
+	
     function AutoCompletion(id, entries) {
+        var maxResults = 10;
         $(id)
             // don't navigate away from the field on tab when selecting an item
             .on("keydown", function(event) {
@@ -12,9 +21,9 @@ var AutoCompletion = (function() {
                 minLength: 3,
                 delay: 500,
                 source: function(request, response) {
-                    // delegate back to autocomplete, but extract the last term
-                    response($.ui.autocomplete.filter(
-                        entries, extractLast(request.term)));
+                    //delegate back to autocomplete, but extract the last term
+                    var results = $.ui.autocomplete.filter(entries, extractLast(request.term));
+                    response(results.slice(0, maxResults));
                 },
                 search: function(e, ui) {
                     //see https://stackoverflow.com/questions/40782638/jquery-autocomplete-performance-going-down-with-each-search
@@ -34,9 +43,31 @@ var AutoCompletion = (function() {
                     terms.push("");
                     this.value = terms.join("");
                     return false;
+                },
+                response: function(event, ui) {
+                    //Check if we have more than "maxResults" results
+                    if (ui.content.length > maxResults) {
+                        //Remove all elements until there are only maxResults remaining (the use of slice() was not supported)
+                        while (ui.content.length > maxResults) {
+                            ui.content.pop();
+                        }
+                        //Add message
+                        ui.content.push({
+                            'label': 'Please narrow down your search',
+                            'value': ''
+                        });
+                    }
+                }
+            }).data("ui-autocomplete")._renderItem = function(ul, item) {
+                //Add the .ui-state-disabled class and don't wrap in <a> if value is empty
+                if (item.value == '') {
+                    return $('<li class="ui-state-disabled">' + item.label + '</li>').appendTo(ul);
+                } else {
+                    return $("<li>")
+                        .append($("<div>").text(item.label))
+                        .appendTo(ul);
                 }
-            });
-
+            }
     }
     return AutoCompletion;
-}());
\ No newline at end of file
+}());
diff --git a/js/imagemonkey/views/annotation.js b/js/imagemonkey/views/annotation.js
index d5cc388f..a0e48c96 100644
--- a/js/imagemonkey/views/annotation.js
+++ b/js/imagemonkey/views/annotation.js
@@ -59,7 +59,7 @@ var AnnotationView = (function() {
         if (this.annotationMode === "browse") {
             $("#loadingSpinner").hide();
             this.updateAnnotationsForImage(this.annotationInfo.annotationId, res);
-            showBrowseAnnotationImageGrid();
+            showBrowseAnnotationImageGrid(null);
         }
 
         if (this.onlyOnce) {
@@ -207,7 +207,7 @@ var AnnotationView = (function() {
                     $("#loadingSpinner").hide();
                     clearDetailedCanvas(inst.detailedCanvas);
                     inst.annotator.reset();
-                    showBrowseAnnotationImageGrid();
+                    showBrowseAnnotationImageGrid([validationId]);
                 }
             }
         });
@@ -255,24 +255,30 @@ var AnnotationView = (function() {
 
 
     AnnotationView.prototype.addAnnotationsUnifiedMode = function() {
+        var validationIds = [];
         var annotations = [];
         for (var key in this.unifiedModeAnnotations) {
             if (this.unifiedModeAnnotations.hasOwnProperty(key)) {
                 if (this.unifiedModeAnnotations[key].dirty) {
                     var annotation = {};
-                    annotation["annotations"] = this.unifiedModeAnnotations[key].annotations;
-                    annotation["label"] = this.unifiedModeAnnotations[key].label;
-                    annotation["sublabel"] = this.unifiedModeAnnotations[key].sublabel;
+                    var entry = this.unifiedModeAnnotations[key];
+                    annotation["annotations"] = entry.annotations;
+                    annotation["label"] = entry.label;
+                    annotation["sublabel"] = entry.sublabel;
                     annotations.push(annotation);
+
+                    if ("validationUuid" in entry && entry.validationUuid !== null)
+                        validationIds.push(entry.validationUuid);
                 }
             }
         }
+
         this.unifiedModeLabels = {};
         this.unifiedModeAnnotations = {};
-        this.addAnnotations(annotations);
+        this.addAnnotations(annotations, validationIds);
     }
 
-    AnnotationView.prototype.addAnnotations = function(annotations) {
+    AnnotationView.prototype.addAnnotations = function(annotations, validationIds = null) {
         var headers = {}
         if (this.browserFingerprint !== null)
             headers["X-Browser-Fingerprint"] = this.browserFingerprint;
@@ -299,18 +305,18 @@ var AnnotationView = (function() {
                 xhr.setRequestHeader("Authorization", "Bearer " + getCookie("imagemonkey"))
             },
             success: function(data) {
-                inst.onAddAnnotationsDone();
+                inst.onAddAnnotationsDone(validationIds);
             }
         });
     }
 
-    AnnotationView.prototype.onAddAnnotationsDone = function() {
+    AnnotationView.prototype.onAddAnnotationsDone = function(validationIds = null) {
         if (this.annotationMode === "default")
             this.loadUnannotatedImage();
         else {
             $("#loadingSpinner").hide();
             changeNavHeader("browse");
-            showBrowseAnnotationImageGrid();
+            showBrowseAnnotationImageGrid(validationIds);
         }
 
         if (this.onlyOnce) {
@@ -337,7 +343,7 @@ var AnnotationView = (function() {
                     $("#loadingSpinner").hide();
                     clearDetailedCanvas(inst.detailedCanvas);
                     inst.annotator.reset();
-                    showBrowseAnnotationImageGrid();
+                    showBrowseAnnotationImageGrid([validationId]);
                 }
             }
         });
@@ -400,6 +406,15 @@ var AnnotationView = (function() {
         else
             key = $("#label").attr("sublabel") + "/" + $("#label").attr("label");
 
+        //get the validationId of the currently selected item
+        var currentSelectedValidationUuid = null;
+        $("#annotationLabelsLst").children().each(function(i) {
+            if ($(this).hasClass("grey inverted")) {
+                currentSelectedValidationUuid = $(this).attr("data-validation-uuid");
+                return;
+            }
+        });
+
         var annos = null;
         if (key in this.unifiedModeAnnotations) {
             if (this.annotator.isDirty()) {
@@ -408,6 +423,7 @@ var AnnotationView = (function() {
                     annotations: annos,
                     label: $("#label").attr("label"),
                     sublabel: $("#label").attr("sublabel"),
+                    validationUuid: currentSelectedValidationUuid,
                     dirty: true
                 };
             }
@@ -418,6 +434,7 @@ var AnnotationView = (function() {
                     annotations: annos,
                     label: $("#label").attr("label"),
                     sublabel: $("#label").attr("sublabel"),
+                    validationUuid: currentSelectedValidationUuid,
                     dirty: true
                 };
             }
@@ -510,11 +527,11 @@ var AnnotationView = (function() {
                 if (inst.annotationView === "unified") {
                     if (data !== null) {
                         for (var i = 0; i < data.length; i++) {
-                            addLabelToLabelLst(data[i].label, '', data[i].uuid, false, false, data[i].unlocked, inst.loggedIn);
+                            addLabelToLabelLst(data[i].label, '', data[i].uuid, false, false, data[i].unlocked, inst.loggedIn, data[i].validation.uuid);
                             if (data[i].sublabels !== null) {
                                 for (var j = 0; j < data[i].sublabels.length; j++) {
                                     addLabelToLabelLst(data[i].label, data[i].sublabels[j].name,
-                                        data[i].sublabels[j].uuid, false, false, data[i].unlocked, inst.loggedIn);
+                                        data[i].sublabels[j].uuid, false, false, data[i].unlocked, inst.loggedIn, data[i].sublabels[j].validation.uuid);
                                 }
                             }
                         }
@@ -636,7 +653,7 @@ var AnnotationView = (function() {
         if (this.annotationMode === "browse") {
             if (this.browseModeLastSelectedAnnotatorMenuItem === null) {
                 if (this.annotator) {
-                    this.annotationSettings.loadPreferedAnnotationTool(this.annotator);
+                    this.annotationSettings.loadPreferedAnnotationTool(this, this.annotator);
                     this.annotator.setPolygonVertexSize(new Settings().getPolygonVertexSize());
                 }
             } else {
@@ -645,7 +662,7 @@ var AnnotationView = (function() {
             }
         } else {
             if (this.annotator) {
-                this.annotationSettings.loadPreferedAnnotationTool(this.annotator);
+                this.annotationSettings.loadPreferedAnnotationTool(this, this.annotator);
                 this.annotator.setPolygonVertexSize(new Settings().getPolygonVertexSize());
             }
         }
@@ -952,7 +969,7 @@ var AnnotationView = (function() {
                         };
                     }
                     elem = addLabelToLabelLst(selectedElem.label, selectedElem.sublabel,
-                        selectedElem.uuid, true, true, false, inst.loggedIn);
+                        selectedElem.uuid, true, true, false, inst.loggedIn, null);
                 }
 
                 //select newly added (or already existing) label
@@ -1040,7 +1057,7 @@ var AnnotationView = (function() {
         if (this.annotationMode === "browse") {
             if (this.browseModeLastSelectedAnnotatorMenuItem === null) {
                 if (this.annotator) {
-                    this.annotationSettings.loadPreferedAnnotationTool(this.annotator);
+                    this.annotationSettings.loadPreferedAnnotationTool(this, this.annotator);
                     this.annotator.setPolygonVertexSize(new Settings().getPolygonVertexSize());
                 }
             } else {
@@ -1049,7 +1066,7 @@ var AnnotationView = (function() {
             }
         } else {
             if (this.annotator) {
-                this.annotationSettings.loadPreferedAnnotationTool(this.annotator);
+                this.annotationSettings.loadPreferedAnnotationTool(this, this.annotator);
                 this.annotator.setPolygonVertexSize(new Settings().getPolygonVertexSize());
             }
         }
@@ -1134,7 +1151,6 @@ var AnnotationView = (function() {
                         '<canvas id="smartAnnotationCanvas"></canvas>' +
                         '</div>' +
                         '</div>');
-
                     inst.populateDetailedCanvas(true);
                 } else {
                     inst.annotator.disableSmartAnnotation();
@@ -1144,7 +1160,7 @@ var AnnotationView = (function() {
                 }
 
                 inst.addMainCanvas();
-                inst.populateCanvas(inst.getUrlFromImageUrl(inst.annotationInfo.imageUrl, inst.annotationInfo.imageUnlocked, this.annotationMode,
+                inst.populateCanvas(getUrlFromImageUrl(inst.annotationInfo.imageUrl, inst.annotationInfo.imageUnlocked, this.annotationMode,
                     this.labelAccessorsLookupTable), false);
 
                 showHideSmartAnnotationControls(enabled);
diff --git a/js/imagemonkey/views/annotation.min.js b/js/imagemonkey/views/annotation.min.js
index 549b49b6..43ef05ba 100644
--- a/js/imagemonkey/views/annotation.min.js
+++ b/js/imagemonkey/views/annotation.min.js
@@ -1 +1 @@
-function isLoadingIndicatorVisible(){return $("#smartAnnotationDimmer").is(":visible")}function showHideAutoAnnotationsLoadButton(autoAnnotations){if(autoAnnotations&&autoAnnotations.length>0&&!isSmartAnnotationEnabled()){$("#loadAutoAnnotationsMenuItem").show();$("#loadAutoAnnotationsMenuItem").removeClass("disabled");$("#loadAutoAnnotationsMenuItem").addClass("orange")}else{$("#loadAutoAnnotationsMenuItem").hide()}}function canvasHasObjects(canvas){if(canvas.fabric().getObjects().length>0)return true;return false}function setLabel(label,sublabel,accessor){$("#label").attr("label",label);$("#label").attr("sublabel",sublabel);if(accessor!==null)$("#label").attr("accessor",accessor);if(sublabel===""){$("#label").text("Annotate all: "+label);$("#bottomLabel").text("Annotate all: "+label);$("#isPluralButton").attr("data-tooltip","Set in case you want to annotate multiple "+label+" objects at once")}else{$("#label").text("Annotate all: "+sublabel+"/"+label);$("#bottomLabel").text("Annotate all: "+sublabel+"/"+label);$("#isPluralButton").attr("data-tooltip","Set in case you want to annotate multiple "+sublabel+"/"+label+" objects at once")}}function changeControl(annotator,imageId){if(imageId===""){$("#labelContainer").hide();$("#doneButton").hide();$("#bottomLabel").hide();$("#isPluralContainer").hide();annotator.block()}else{$("#labelContainer").show();$("#doneButton").show();$("#bottomLabel").show();$("#isPluralContainer").show();annotator.unblock()}}function dataURItoBlob(dataURI){var byteString=atob(dataURI.split(",")[1]);var ab=new ArrayBuffer(byteString.length);var ia=new Uint8Array(ab);for(var i=0;i<byteString.length;i++){ia[i]=byteString.charCodeAt(i)}return new Blob([ab],{type:"image/png"})}function clearDetailedCanvas(detailedCanvas){if(detailedCanvas!==null){detailedCanvas.clear()}}function getCanvasScaleFactor(annotationInfo){var maxWidth=document.getElementById("annotationAreaContainer").clientWidth-50;var scaleFactor=maxWidth/annotationInfo.origImageWidth;if(scaleFactor>1)scaleFactor=1;return scaleFactor}function getUrlFromImageUrl(imageUrl,imageUnlocked,annotationMode,lookupTable){var url=imageUrl===""?"img/oops-no-annotation-left.png":imageUrl;if(imageUrl!==""){if(!imageUnlocked){url+="?token="+getCookie("imagemonkey")}if(annotationMode==="browse"){if($("#highlightParentAnnotationsCheckbox").checkbox("is checked")){var labelToAnnotate=$("#label").attr("accessor");if(labelToAnnotate in lookupTable){if(!imageUnlocked){url+="&highlight="+encodeURIComponent(lookupTable[labelToAnnotate])}else{url+="?highlight="+encodeURIComponent(lookupTable[labelToAnnotate])}}}}}return url}function showHideControls(show,imageUnlocked){if(show){$("#doneButton").show();$("#blacklistButton").show();$("#notAnnotableButton").show();$("#annotatorMenu").show();$("#smartAnnotation").show();$("#showSmartAnnotationHelpDlg").show();$("#annotationControlsGrid").show();$("#annotationControlsMainArea").show();$("#annotationButtons").show();$("#loadingSpinner").hide();if(imageUnlocked)$("#imageLockedLabel").hide();else $("#imageLockedLabel").show();$("#annotationColumnContent").show();$("#annotationColumnSpacer").show();$("#annotationPropertiesColumnSpacer").show()}else{$("#doneButton").hide();$("#blacklistButton").hide();$("#notAnnotableButton").hide();$("#annotatorMenu").hide();$("#smartAnnotation").hide();$("#showSmartAnnotationHelpDlg").hide();$("#annotationControlsGrid").hide();$("#annotationControlsMainArea").hide();$("#annotationButtons").hide();$("#loadingSpinner").show();$("#imageLockedLabel").hide();$("#annotationColumnContent").hide();$("#annotationColumnSpacer").hide();$("#annotationPropertiesColumnSpacer").hide()}}function showHideSmartAnnotationControls(show){if(show){$("#circleMenuItem").hide();$("#polygonMenuItem").hide();$("#smartAnnotationFgMenuItem").show();$("#smartAnnotationBgMenuItem").show()}else{$("#circleMenuItem").show();$("#polygonMenuItem").show();$("#smartAnnotationFgMenuItem").hide();$("#smartAnnotationBgMenuItem").hide()}$("#annotatorMenu .item").popup({inline:true,hoverable:true})}function isTrashMenuButtonEnabled(){return!$("#trashMenuItem").hasClass("disabled")}function isSmartAnnotationEnabled(){var obj=$("smartAnnotation");if(obj.length){return obj.checkbox("is checked")}return false}function onLabelInLabelLstRemoveClicked(elem){$("#removeLabelFromUnifiedModeLstDlg").attr("data-to-be-removed-uuid",$(elem).parent().attr("data-uuid"));$("#removeLabelFromUnifiedModeLstDlg").modal("show")}function addLabelToLabelLst(label,sublabel,uuid,allowRemove=false,newlyCreated=false,isUnlocked=false,loggedIn=false){var id="labellstitem-"+uuid;var displayedLabel=sublabel===""?label:sublabel+"/"+label;if(allowRemove){displayedLabel='<span class="left-floated">'+displayedLabel+'</span><span class="right-floated" onclick="onLabelInLabelLstRemoveClicked(this);">'+'<i class="right icon delete ui red"></i></span>'}else{displayedLabel="<p>"+displayedLabel+"</p>"}var disabledStr=" ";var onClickCallback="annotationView.onLabelInLabelLstClicked(this);";var tooltip="";if(!isUnlocked&&!loggedIn){disabledStr=" disabled ";onClickCallback="";tooltip=' data-content="Please login to annotate this label"'}var elem=$('<div class="ui'+disabledStr+'segment center aligned labelslstitem" id="'+id+'"'+tooltip+' data-label="'+label+'" data-uuid="'+uuid+'" data-sublabel="'+sublabel+'" data-newly-created="'+newlyCreated+'" onclick="'+onClickCallback+'"'+" onmouseover=\"this.style.backgroundColor='#e6e6e6';\""+" onmouseout=\"this.style.backgroundColor='white';\""+' style="overflow: auto;">'+displayedLabel+"</div>");if(tooltip!==""){$(elem).popup({inline:true,hoverable:true,position:"bottom center",delay:{show:300,hide:300}})}$("#annotationLabelsLst").append(elem);return elem}function addRefinementToRefinementsLst(name,uuid,icon){var id="refinementlstitem-"+uuid;$("#annotationPropertiesLst").append('<div class="ui segment center aligned refinementlstitem" id="'+id+'"'+' data-uuid="'+uuid+'" onclick="onRefinementInRefinementsLstClicked(this);"'+"onmouseover=\"this.style.backgroundColor='#e6e6e6';\""+"onmouseout=\"this.style.backgroundColor='white';\""+'style="overflow: auto;">'+'<span class="left-floated">'+'<p><i class="'+icon+' icon"></i> '+name+"</p>"+'</span><span class="right-floated"><i class="right icon delete ui red"></i></span></div>')}function onRefinementInRefinementsLstClicked(elem){$("#removeAnnotationRefinementsDlg").attr("data-to-be-removed-id",$(elem).attr("id"));$("#removeAnnotationRefinementsDlg").modal("show")}function changeNavHeader(mode){if(mode==="default"){$("#labelContainer").css("margin-top","-2em");$("#navHeader").css("min-height","290px");$("#navHeader").show()}else if(mode==="noimage"){$("#labelContainer").css("margin-top","0");$("#navHeader").css("min-height","200px");$("#annotationControlsGrid").hide();$("#navHeader").show()}else{$("#labelContainer").css("margin-top","0");$("#navHeader").css("min-height","200px");$("#navHeader").show()}}function getActiveAnnotationMenuItem(ignoreAutoLoadButton){var ret="";$("#annotatorMenu").children().each((function(){if($(this).hasClass("active")){if(ignoreAutoLoadButton){if($(this).attr("id")!=="loadAutoAnnotationsMenuItem"){ret=$(this).attr("id");return}}else{ret=$(this).attr("id");return}}}));return ret}function zoomIn(canvas){canvas.fabric().setZoom(canvas.fabric().getZoom()*1.1)}function zoomOut(canvas){canvas.fabric().setZoom(canvas.fabric().getZoom()/1.1)}function AnnotationInfo(){this.imageId="";this.validationId="";this.origImageWidth=0;this.origImageHeight=0;this.annotationId="";this.imageUrl="";this.imageUnlocked=false}var UnifiedModeStates={uninitialized:0,fetchedLabels:1,fetchedAnnotations:2,initialized:3};var AnnotationView=function(){function AnnotationView(apiBaseUrl,playgroundBaseUrl,annotationMode,annotationView,annotationId,annotationRevision,validationId,loggedIn){this.annotationMode=annotationMode;this.annotationView=annotationView;this.loggedIn=loggedIn;this.apiBaseUrl=apiBaseUrl;this.playgroundBaseUrl=playgroundBaseUrl;this.annotationRevision=annotationRevision;this.validationId=validationId;this.annotationId=annotationId;this.imageMonkeyApi=new ImageMonkeyApi(this.apiBaseUrl);this.imageMonkeyApi.setToken(getCookie("imagemonkey"));this.canvas=null;this.annotator=null;this.detailedCanvas=null;this.numOfPendingRequests=0;this.autoAnnotations=null;this.labelId=null;this.annotationInfo=new AnnotationInfo;this.unifiedModePopulated=UnifiedModeStates.uninitialized;this.annotationSettings=new AnnotationSettings;this.colorPicker=null;this.existingAnnotations=null;this.browserFingerprint=null;this.deleteObjectsPopupShown=false;this.unifiedModeAnnotations={};this.unifiedModeLabels={};this.pluralAnnotations=false;this.pluralLabels=null;this.initializeLabelsLstAftLoadDelayed=false;this.browseModeLastSelectedAnnotatorMenuItem=null;this.annotationRefinementsContextMenu={};this.labelAccessorsLookupTable={};this.availableLabels=[];this.availableLabelsLookupTable={};this.labelsAutoCompletion=null}AnnotationView.prototype.setSentryDSN=function(sentryDSN){try{Sentry.init({dsn:sentryDSN})}catch(e){}};AnnotationView.prototype.handleUpdateAnnotationsRes=function(res){if(this.annotationMode==="browse"){$("#loadingSpinner").hide();this.updateAnnotationsForImage(this.annotationInfo.annotationId,res);showBrowseAnnotationImageGrid()}if(this.onlyOnce){showHideControls(false,this.annotationInfo.imageUnlocked);$("#onlyOnceDoneMessageContainer").show();$("#onlyOnceDoneMessage").fadeIn("slow");$("#loadingSpinner").hide()}};AnnotationView.prototype.onCanvasBackgroundImageSet=function(){if(isSmartAnnotationEnabled())this.populateDetailedCanvas();if(this.existingAnnotations!==null){this.annotator.loadAnnotations(this.existingAnnotations,this.canvas.fabric().backgroundImage.scaleX);this.existingAnnotations=this.annotator.toJSON()}showHideControls(true,this.annotationInfo.imageUnlocked);$("#annotationArea").css({"border-width":"1px","border-style":"solid","border-color":"#000000"});if(this.annotationView==="unified"){if(this.initializeLabelsLstAftLoadDelayed){this.selectLabelInUnifiedLabelsLstAfterLoad();this.initializeLabelsLstAftLoadDelayed=false}}};AnnotationView.prototype.loadAnnotatedImage=function(annotationId,annotationRevision){showHideControls(false,this.annotationInfo.imageUnlocked);var inst=this;this.imageMonkeyApi.getAnnotatedImage(annotationId,annotationRevision).then((function(data){inst.handleAnnotatedImageResponse(data);$("#blacklistButton").hide();$("#notAnnotableButton").hide()})).catch((function(e){Sentry.captureException(e)}))};AnnotationView.prototype.onAnnotatorObjectDeselected=function(){context.destroy("#annotationColumn");if(this.annotationView==="unified"){$("#annotationPropertiesLst").empty();$("#addRefinementButton").addClass("disabled");$("#addRefinementButtonTooltip").attr("data-tooltip","Select a annotation first")}};AnnotationView.prototype.onAnnotatorObjectSelected=function(){if(this.annotator.objectsSelected()){if(this.annotator.isSelectMoveModeEnabled()){$("#trashMenuItem").removeClass("disabled");$("#propertiesMenuItem").removeClass("disabled");var strokeColor=this.annotator.getStrokeColorOfSelected();if(strokeColor!==null)this.colorPicker.setColor(strokeColor);if(this.annotationView==="unified"){var refs=this.annotator.getRefinementsOfSelectedItem();var refsUuidMapping=annotationRefinementsDlg.getRefinementsUuidMapping();for(var i=0;i<refs.length;i++){if(refs[i]in refsUuidMapping){addRefinementToRefinementsLst(refsUuidMapping[refs[i]].name,refs[i],refsUuidMapping[refs[i]].icon)}}$("#addRefinementButton").removeClass("disabled");$("#addRefinementButtonTooltip").removeAttr("data-tooltip");context.attach("#annotationColumn",this.annotationRefinementsContextMenu.data)}}}else{$("#trashMenuItem").addClass("disabled");$("#propertiesMenuItem").addClass("disabled")}};AnnotationView.prototype.onAnnotatorMouseUp=function(){if(isSmartAnnotationEnabled()&&!this.annotator.isPanModeEnabled())this.grabCutMe()};AnnotationView.prototype.populateCanvas=function(backgroundImageUrl,initAnnotator,force=true){if(this.canvas!==null&&!force)this.annotator.reset();else{this.canvas=new CanvasDrawer("annotationArea");this.canvas.fabric().selection=false;this.annotator=new Annotator(this.canvas.fabric(),this.onAnnotatorObjectSelected.bind(this),this.onAnnotatorMouseUp.bind(this),this.onAnnotatorObjectDeselected.bind(this))}var scaleFactor=getCanvasScaleFactor(this.annotationInfo);var w=this.annotationInfo.origImageWidth*scaleFactor;var h=this.annotationInfo.origImageHeight*scaleFactor;$("#annotationAreaContainer").attr("width",w);$("#annotationAreaContainer").attr("height",h);$("#annotationAreaContainer").attr("scaleFactor",scaleFactor);this.canvas.setWidth(w);this.canvas.setHeight(h);if(initAnnotator){this.canvas.setCanvasBackgroundImageUrl(backgroundImageUrl,(function(){this.annotator.initHistory();this.onCanvasBackgroundImageSet()}))}else{this.canvas.setCanvasBackgroundImageUrl(backgroundImageUrl,this.onCanvasBackgroundImageSet.bind(this))}};AnnotationView.prototype.markAsNotAnnotatable=function(validationId){showHideControls(false,this.annotationInfo.imageUnlocked);var url=this.apiBaseUrl+"/v1/validation/"+validationId+"/not-annotatable";var inst=this;$.ajax({url:url,type:"POST",beforeSend:function(xhr){xhr.setRequestHeader("Authorization","Bearer "+getCookie("imagemonkey"))},success:function(data,status,xhr){if(inst.annotationMode==="default")inst.loadUnannotatedImage();else{$("#loadingSpinner").hide();clearDetailedCanvas(inst.detailedCanvas);inst.annotator.reset();showBrowseAnnotationImageGrid()}}})};AnnotationView.prototype.updateAnnotations=function(res){if(_.isEqual(res,this.existingAnnotations)){showHideControls(false,this.annotationInfo.imageUnlocked);clearDetailedCanvas(this.detailedCanvas);this.annotator.reset();this.handleUpdateAnnotationsRes(this.existingAnnotations);return}var postData={};postData["annotations"]=res;var headers={};if(this.browserFingerprint!==null)headers["X-Browser-Fingerprint"]=this.browserFingerprint;headers["X-App-Identifier"]=this.appIdentifier;showHideControls(false,this.annotationInfo.imageUnlocked);clearDetailedCanvas(this.detailedCanvas);this.annotator.reset();var url=this.apiBaseUrl+"/v1/annotation/"+this.annotationInfo.annotationId;var inst=this;$.ajax({url:url,type:"PUT",data:JSON.stringify(postData),headers:headers,beforeSend:function(xhr){xhr.setRequestHeader("Authorization","Bearer "+getCookie("imagemonkey"))},success:function(data){inst.handleUpdateAnnotationsRes(res)}})};AnnotationView.prototype.addAnnotationsUnifiedMode=function(){var annotations=[];for(var key in this.unifiedModeAnnotations){if(this.unifiedModeAnnotations.hasOwnProperty(key)){if(this.unifiedModeAnnotations[key].dirty){var annotation={};annotation["annotations"]=this.unifiedModeAnnotations[key].annotations;annotation["label"]=this.unifiedModeAnnotations[key].label;annotation["sublabel"]=this.unifiedModeAnnotations[key].sublabel;annotations.push(annotation)}}}this.unifiedModeLabels={};this.unifiedModeAnnotations={};this.addAnnotations(annotations)};AnnotationView.prototype.addAnnotations=function(annotations){var headers={};if(this.browserFingerprint!==null)headers["X-Browser-Fingerprint"]=this.browserFingerprint;headers["X-App-Identifier"]=this.appIdentifier;showHideControls(false,this.annotationInfo.imageUnlocked);clearDetailedCanvas(this.detailedCanvas);this.annotator.reset();if(annotations.length===0){this.onAddAnnotationsDone();return}var url=this.apiBaseUrl+"/v1/donation/"+this.annotationInfo.imageId+"/annotate";var inst=this;$.ajax({url:url,type:"POST",data:JSON.stringify(annotations),headers:headers,beforeSend:function(xhr){xhr.setRequestHeader("Authorization","Bearer "+getCookie("imagemonkey"))},success:function(data){inst.onAddAnnotationsDone()}})};AnnotationView.prototype.onAddAnnotationsDone=function(){if(this.annotationMode==="default")this.loadUnannotatedImage();else{$("#loadingSpinner").hide();changeNavHeader("browse");showBrowseAnnotationImageGrid()}if(this.onlyOnce){$("#onlyOnceDoneMessage").fadeIn("slow");showHideControls(false);$("#loadingSpinner").hide()}};AnnotationView.prototype.blacklistAnnotation=function(validationId){showHideControls(false,this.annotationInfo.imageUnlocked);var url=this.apiBaseUrl+"/v1/validation/"+validationId+"/blacklist-annotation";var inst=this;$.ajax({url:url,type:"POST",beforeSend:function(xhr){xhr.setRequestHeader("Authorization","Bearer "+getCookie("imagemonkey"))},success:function(data,status,xhr){if(inst.annotationMode==="default")inst.loadUnannotatedImage();else{$("#loadingSpinner").hide();clearDetailedCanvas(inst.detailedCanvas);inst.annotator.reset();showBrowseAnnotationImageGrid()}}})};AnnotationView.prototype.loadUnannotatedImage=function(validationId){showHideControls(false,this.annotationInfo.imageUnlocked);var inst=this;this.imageMonkeyApi.getUnannotatedImage(validationId,inst.labelId).then((function(data){inst.handleUnannotatedImageResponse(data)})).catch((function(){inst.handleUnannotatedImageResponse(null)}))};AnnotationView.prototype.getAnnotationInfo=function(){return this.annotationInfo};AnnotationView.prototype.populateDefaultsAndLoadData=function(){if(this.annotationMode==="browse")$("#loadingSpinner").show();var inst=this;Promise.all([this.imageMonkeyApi.getPluralLabels(),this.imageMonkeyApi.getLabelAccessors(true)]).then((function(data){inst.pluralLabels=data[0];for(var i=0;i<data[1].length;i++){inst.labelAccessorsLookupTable[data[1][i].accessor]=data[1][i].parent_accessor}if(inst.annotationMode==="default"){if(inst.validationId==="")inst.loadUnannotatedImage();else inst.loadUnannotatedImage(inst.validationId)}if(inst.annotationMode==="refine"){if(inst.annotationId!=="")inst.loadAnnotatedImage(inst.annotationId,inst.annotationRevision)}if(inst.annotationMode==="browse")$("#loadingSpinner").hide()})).catch((function(e){Sentry.captureException(e)}))};AnnotationView.prototype.saveCurrentSelectLabelInUnifiedModeList=function(){var key="";if($("#label").attr("sublabel")==="")key=$("#label").attr("label");else key=$("#label").attr("sublabel")+"/"+$("#label").attr("label");var annos=null;if(key in this.unifiedModeAnnotations){if(this.annotator.isDirty()){annos=this.annotator.toJSON();this.unifiedModeAnnotations[key]={annotations:annos,label:$("#label").attr("label"),sublabel:$("#label").attr("sublabel"),dirty:true}}}else{annos=this.annotator.toJSON();if(annos.length>0){this.unifiedModeAnnotations[key]={annotations:annos,label:$("#label").attr("label"),sublabel:$("#label").attr("sublabel"),dirty:true}}}};AnnotationView.prototype.onLabelInLabelLstClicked=function(elem){var key="";this.saveCurrentSelectLabelInUnifiedModeList();$("#annotationLabelsLst").children().each((function(i){$(this).removeClass("grey inverted")}));setLabel($(elem).attr("data-label"),$(elem).attr("data-sublabel"),null);$(elem).addClass("grey inverted");this.annotator.deleteAll();key="";if($(elem).attr("data-sublabel")==="")key=$(elem).attr("data-label");else key=$(elem).attr("data-sublabel")+"/"+$(elem).attr("data-label");if(key in this.unifiedModeAnnotations){this.annotator.loadAnnotations(this.unifiedModeAnnotations[key].annotations,this.canvas.fabric().backgroundImage.scaleX)}};AnnotationView.prototype.populateDetailedCanvas=function(force=false){if(this.detailedCanvas!==null&&!force)this.detailedCanvas.clear();else this.detailedCanvas=new CanvasDrawer("smartAnnotationCanvas",0,0);var maxWidth=document.getElementById("smartAnnotationContainer").clientWidth-50;var scaleFactor=maxWidth/this.annotationInfo.origImageWidth;if(scaleFactor>1)scaleFactor=1;var w=this.annotationInfo.origImageWidth*scaleFactor;var h=this.annotationInfo.origImageHeight*scaleFactor;$("#smartAnnotationCanvasWrapper").attr("width",w);$("#smartAnnotationCanvasWrapper").attr("height",h);$("#smartAnnotationCanvasWrapper").attr("scaleFactor",scaleFactor);this.detailedCanvas.setWidth(w);this.detailedCanvas.setHeight(h);this.detailedCanvas.setCanvasBackgroundImage(this.canvas.fabric().backgroundImage,null)};AnnotationView.prototype.grabCutMe=function(){this.numOfPendingRequests+=1;$("#smartAnnotationCanvasWrapper").dimmer("show");var blob=dataURItoBlob(this.annotator.getMask());var formData=new FormData;formData.append("image",blob);formData.append("uuid",this.annotationInfo.imageId);var inst=this;$.ajax({url:inst.playgroundBaseUrl+"/v1/grabcut",processData:false,contentType:false,data:formData,type:"POST",success:function(data,status,xhr){inst.pollUntilProcessed(xhr.getResponseHeader("Location"))}})};AnnotationView.prototype.getLabelsForImage=function(imageId,onlyUnlockedLabels){var url=this.apiBaseUrl+"/v1/donation/"+imageId+"/labels?only_unlocked_labels="+(onlyUnlockedLabels?"true":"false");var inst=this;$.ajax({url:url,dataType:"json",type:"GET",beforeSend:function(xhr){xhr.setRequestHeader("Authorization","Bearer "+getCookie("imagemonkey"))},success:function(data){if(inst.annotationView==="unified"){if(data!==null){for(var i=0;i<data.length;i++){addLabelToLabelLst(data[i].label,"",data[i].uuid,false,false,data[i].unlocked,inst.loggedIn);if(data[i].sublabels!==null){for(var j=0;j<data[i].sublabels.length;j++){addLabelToLabelLst(data[i].label,data[i].sublabels[j].name,data[i].sublabels[j].uuid,false,false,data[i].unlocked,inst.loggedIn)}}}}inst.unifiedModePopulated|=UnifiedModeStates.fetchedLabels;if(inst.unifiedModePopulated===UnifiedModeStates.initialized){if(inst.canvas.fabric().backgroundImage&&inst.canvas.fabric().backgroundImage!==undefined){inst.initializeLabelsLstAftLoadDelayed=false;inst.selectLabelInUnifiedLabelsLstAfterLoad()}else{inst.initializeLabelsLstAftLoadDelayed=true}}}},error:function(xhr,options,err){}})};AnnotationView.prototype.getAnnotationsForImage=function(imageId){var url="";if(this.annotationInfo.imageUnlocked)url=this.apiBaseUrl+"/v1/donation/"+imageId+"/annotations";else url=this.apiBaseUrl+"/v1/unverified-donation/"+imageId+"/annotations"+"?token="+getCookie("imagemonkey");var inst=this;$.ajax({url:url,dataType:"json",type:"GET",beforeSend:function(xhr){xhr.setRequestHeader("Authorization","Bearer "+getCookie("imagemonkey"))},success:function(data){if(inst.annotationView==="unified"){for(var i=0;i<data.length;i++){if(data[i].validation.sublabel!=="")inst.unifiedModeAnnotations[data[i].validation.sublabel+"/"+data[i].validation.label]={annotations:data[i].annotations,label:data[i].validation.label,sublabel:data[i].validation.sublabel,dirty:false};else{inst.unifiedModeAnnotations[data[i].validation.label]={annotations:data[i].annotations,label:data[i].validation.label,sublabel:data[i].validation.sublabel,dirty:false}}}inst.unifiedModePopulated|=UnifiedModeStates.fetchedAnnotations;if(inst.unifiedModePopulated===UnifiedModeStates.initialized){if(inst.canvas.fabric().backgroundImage&&inst.canvas.fabric().backgroundImage!==undefined){inst.initializeLabelsLstAftLoadDelayed=false;inst.selectLabelInUnifiedLabelsLstAfterLoad()}else{inst.initializeLabelsLstAftLoadDelayed=true}}}},error:function(xhr,options,err){}})};AnnotationView.prototype.selectLabelInUnifiedLabelsLstAfterLoad=function(){var unifiedModeToolboxChildren=$("#annotationLabelsLst").children(".labelslstitem");var foundLabelInUnifiedModeToolbox=false;unifiedModeToolboxChildren.each((function(index,value){if($(this).attr("data-label")===$("#label").attr("label")&&$(this).attr("data-sublabel")===$("#label").attr("sublabel")){foundLabelInUnifiedModeToolbox=true;$(this).click();return false}}));if(!foundLabelInUnifiedModeToolbox){var firstItem=unifiedModeToolboxChildren.first();if(firstItem&&firstItem.length===1)firstItem[0].click()}$("#unifiedModeLabelsLstLoadingIndicator").hide()};AnnotationView.prototype.handleAnnotatedImageResponse=function(data){this.annotationInfo.imageId=data.image.uuid;this.annotationInfo.origImageWidth=data.image.width;this.annotationInfo.origImageHeight=data.image.height;this.annotationInfo.annotationId=data.uuid;this.annotationInfo.imageUrl=data.image.url;this.annotationInfo.imageUnlocked=data.image.unlocked;this.initializeLabelsLstAftLoadDelayed=false;this.autoAnnotations=null;this.existingAnnotations=data["annotations"];showHideAutoAnnotationsLoadButton(this.autoAnnotations);setLabel(data.validation.label,data.validation.sublabel,null);if(this.canvas!==undefined&&this.canvas!==null){this.annotator.reset()}this.addMainCanvas();this.populateCanvas(getUrlFromImageUrl(data.image.url,data.image.unlocked,this.annotationMode,this.labelAccessorsLookupTable),false);changeControl(this.annotator,this.annotationInfo.imageId);this.numOfPendingRequests=0;showHideControls(true,this.annotationInfo.imageUnlocked);if(this.annotationMode==="browse"){if(this.browseModeLastSelectedAnnotatorMenuItem===null){if(this.annotator){this.annotationSettings.loadPreferedAnnotationTool(this.annotator);this.annotator.setPolygonVertexSize((new Settings).getPolygonVertexSize())}}else{this.changeMenuItem(this.browseModeLastSelectedAnnotatorMenuItem);this.annotator.setShape(this.browseModeLastSelectedAnnotatorMenuItem)}}else{if(this.annotator){this.annotationSettings.loadPreferedAnnotationTool(this.annotator);this.annotator.setPolygonVertexSize((new Settings).getPolygonVertexSize())}}populateRevisionsDropdown(data["num_revisions"],data["revision"]);showHideRevisionsDropdown();if(this.annotationView==="unified"){addLabelToLabelLst(data.validation.label,data.validation.sublabel,data.uuid,false,false,data.validation.unlocked,this.loggedIn);var firstItem=$("#annotationLabelsLst").children(".labelslstitem").first();if(firstItem&&firstItem.length===1){$(firstItem[0]).addClass("grey inverted")}$("#unifiedModeLabelsLstLoadingIndicator").hide()}var pushedUrl=window.location.pathname+"?annotation_id="+data.uuid;if(data.revision!==-1)pushedUrl+="&rev="+data.revision;if(this.annotationView==="unified")pushedUrl+="&view=unified";history.pushState({current_page:pushedUrl,previous_page:window.location.href},"",pushedUrl)};AnnotationView.prototype.changeMenuItem=function(type){var id="";if(type==="Rectangle")id="rectMenuItem";else if(type==="Circle")id="circleMenuItem";else if(type==="Polygon")id="polygonMenuItem";else if(type==="PanMode")id="panMenuItem";else if(type==="BlockSelection")id="blockSelectMenuItem";else if(type==="FreeDrawing")id="freeDrawingMenuItem";else if(type==="ForegroundSelection")id="smartAnnotationFgMenuItem";else if(type==="BackgroundSelection")id="smartAnnotationBgMenuItem";else if(type==="SelectMove")id="selectMoveMenutItem";if(this.annotationMode==="browse")this.browseModeLastSelectedAnnotatorMenuItem=type;$("#annotatorMenu").children().each((function(){if($(this).attr("id")===id)$(this).addClass("active");else $(this).removeClass("active")}))};AnnotationView.prototype.pollUntilProcessed=function(uuid){var url=this.playgroundBaseUrl+"/v1/grabcut/"+uuid;var inst=this;$.getJSON(url,(function(response){if(jQuery.isEmptyObject(response))setTimeout(inst.pollUntilProcessed(uuid),1e3);else{inst.detailedCanvas.clearObjects();if(response["result"]["points"].length>0){var data=[];data.push(response["result"]);inst.annotator.setSmartAnnotationData(data);inst.detailedCanvas.drawAnnotations(data,$("#smartAnnotationCanvasWrapper").attr("scaleFactor"))}inst.numOfPendingRequests-=1;if(inst.numOfPendingRequests<=0){$("#smartAnnotationCanvasWrapper").dimmer("hide");inst.numOfPendingRequests=0}}}))};AnnotationView.prototype.addMainCanvas=function(){$("#annotationColumnSpacer").remove();$("#annotationPropertiesColumnSpacer").remove();$("#annotationColumnContent").remove();var spacer="";var inst=this;var unifiedModePropertiesLst="";var w="sixteen";if(isSmartAnnotationEnabled()){w="eight"}else{var unifiedModePropertiesLstWidth="four";var workspaceSize=this.annotationSettings.loadWorkspaceSize();if(this.annotationView==="unified"){var spacerWidth="three";if(workspaceSize==="small"){w="eight";spacerWidth="four";unifiedModePropertiesLstWidth="four"}else if(workspaceSize==="medium"){w="eight";spacerWidth="four";unifiedModePropertiesLstWidth="four"}else if(workspaceSize==="big"){w="eight";spacerWidth="four";unifiedModePropertiesLstWidth="four"}var unifiedModeLabelsLstUiElems="";if(this.annotationMode!=="refine"){var showUnifiedModeLabelsLstUiElems=false;if(this.annotationMode==="default")showUnifiedModeLabelsLstUiElems=true;else{if(!$("#annotationsOnlyCheckbox").checkbox("is checked"))showUnifiedModeLabelsLstUiElems=true}if(showUnifiedModeLabelsLstUiElems){unifiedModeLabelsLstUiElems='<div class="ui center aligned grid">'+'<div class="twelve wide centered column">'+'<div class="ui form">'+'<div class="fields">'+'<div class="field">'+'<div class="ui search">'+'<div class="ui center aligned action input" id="addLabelToUnifiedModeListForm">'+'<div class="ui input">'+'<input placeholder="Enter label..." type="text" id="addLabelsToUnifiedModeListLabels" class="mousetrap">'+"</div>"+'<div class="ui button" id="addLabelToUnifiedModeListButton">Add</div>'+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"}}spacer='<div class="'+spacerWidth+' wide column" id="annotationColumnSpacer">'+'<h2 class="ui center aligned header">'+'<div class="content">'+"Labels"+"</div>"+"</h2>"+'<div class="ui basic segment">'+'<div class="ui segments">'+'<div class="ui raised segments" style="overflow: auto; height: 50vh;" id="annotationLabelsLst">'+'<div class="ui active indeterminate loader" id="unifiedModeLabelsLstLoadingIndicator"></div>'+"</div>"+unifiedModeLabelsLstUiElems+"</div>"+"</div>"+"</div>";unifiedModePropertiesLst='<div class="'+unifiedModePropertiesLstWidth+' wide column" id="annotationPropertiesColumnSpacer">'+'<h2 class="ui center aligned header">'+'<div class="content">'+"Properties"+"</div>"+"</h2>"+'<div class="ui basic segment">'+'<div class="ui segments">'+'<div class="ui raised segments" style="overflow: auto; height: 50vh;" id="annotationPropertiesLst">'+"</div>"+'<div class="ui center aligned grid">'+'<div class="twelve wide centered column">'+'<div class="ui form">'+'<div class="fields">'+'<div class="field">'+'<div class="ui search">'+'<div class="ui center aligned action input" id="addRefinementForm">'+'<div class="ui small search selection dropdown" id="addRefinementDropdown">'+'<div class="default text">Select Refinement</div>'+'<div class="menu" id="addRefinementDropdownMenu">'+"</div>"+"</div>"+'<div id="addRefinementButtonTooltip" data-tooltip="Select a annotation first" data-position="left center">'+'<div class="ui disabled button" id="addRefinementButton">Add</div>'+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"}else{if(workspaceSize==="small"){w="eight";spacer='<div class="four wide column" id="annotationColumnSpacer"></div>'}else if(workspaceSize==="medium"){w="ten";spacer='<div class="three wide column" id="annotationColumnSpacer"></div>'}else if(workspaceSize==="big")w="sixteen"}}var data=spacer+'<div class="'+w+' wide center aligned column" id="annotationColumnContent">'+'<div id="annotationAreaContainer">'+'<canvas id="annotationArea" imageId=""></canvas>'+"</div>"+"</div>"+unifiedModePropertiesLst;$("#annotationColumn").show();$("#annotationColumn").append(data);if(this.annotationView==="unified"){$("#addLabelToUnifiedModeListButton").click((function(e){var selectedElem=null;var labelName=escapeHtml($("#addLabelsToUnifiedModeListLabels").val());if(!inst.loggedIn){if(!(labelName in inst.availableLabelsLookupTable)){$("#warningMsgText").text("Please sign in first to add new labels!");$("#warningMsg").show(200).delay(1500).hide(200);return}}else{var pattern=new RegExp("^[a-zA-Z ]+$");if(!pattern.test(labelName)){$("#warningMsgText").text("Invalid label name "+labelName+". (supported characters: a-zA-Z and ' ')");$("#warningMsg").show(200).delay(1500).hide(200);return}}if(labelName in inst.availableLabelsLookupTable)selectedElem=inst.availableLabelsLookupTable[labelName];if(selectedElem===null){if(inst.loggedIn){var tempUuid=labelName.replace(/\s/g,"-");selectedElem={uuid:tempUuid,label:labelName,sublabel:"",newly_created:true}}else{$("#warningMsgText").text("Please sign in first to add new labels!");$("#warningMsg").show(200).delay(1500).hide(200);return}}var alreadyExistsInUnifiedModeLabelsLst=false;var elem;$("#annotationLabelsLst").children(".labelslstitem").each((function(idx){if($(this).attr("data-uuid")===selectedElem.uuid){alreadyExistsInUnifiedModeLabelsLst=true;elem=$(this);return false}if(selectedElem.uuid===labelName&&$(this).attr("data-label")===selectedElem.uuid&&$(this).attr("data-sublabel")===""){alreadyExistsInUnifiedModeLabelsLst=true;elem=$(this);return false}}));if(!alreadyExistsInUnifiedModeLabelsLst){if(selectedElem.sublabel!==""){inst.unifiedModeLabels[selectedElem.uuid]={label:selectedElem.label,sublabels:[{name:selectedElem.sublabel}],annotatable:true}}else{inst.unifiedModeLabels[selectedElem.uuid]={label:selectedElem.label,annotatable:true}}elem=addLabelToLabelLst(selectedElem.label,selectedElem.sublabel,selectedElem.uuid,true,true,false,inst.loggedIn)}inst.onLabelInLabelLstClicked(elem);$("#addLabelsToUnifiedModeListLabels").val("")}));$("#addRefinementButton").click((function(e){var refs=inst.annotator.getRefinementsOfSelectedItem();if(refs.indexOf($("#addRefinementDropdown").dropdown("get value"))==-1){refs.push($("#addRefinementDropdown").dropdown("get value"));inst.annotator.setRefinements(refs);var allRefs=annotationRefinementsDlg.getRefinementsUuidMapping();var refIcon="";if($("#addRefinementDropdown").dropdown("get value")in allRefs)refIcon=allRefs[$("#addRefinementDropdown").dropdown("get value")].icon;addRefinementToRefinementsLst($("#addRefinementDropdown").dropdown("get text"),$("#addRefinementDropdown").dropdown("get value"),refIcon)}$("#addRefinementDropdown").dropdown("restore placeholder text")}));var refs=annotationRefinementsDlg.getRefinementsUuidMapping();for(var k in refs){if(refs.hasOwnProperty(k)){var entry='<div class="item" data-value="'+k+'">';if(refs[k].icon!==""){entry+='<i class="'+refs[k].icon+' icon"></i>'}entry+=refs[k].name+"</div>";$("#addRefinementDropdownMenu").append(entry)}}$("#addRefinementDropdown").dropdown()}$("#annotationArea").attr("imageId",this.annotationInfo.imageId);$("#annotationArea").attr("origImageWidth",this.annotationInfo.origImageWidth);$("#annotationArea").attr("origImageHeight",this.annotationInfo.origImageHeight);$("#annotationArea").attr("validationId",this.annotationInfo.validationId)};AnnotationView.prototype.handleUnannotatedImageResponse=function(data){this.existingAnnotations=null;this.autoAnnotations=null;this.initializeLabelsLstAftLoadDelayed=false;if(data!==null){this.annotationInfo.imageId=data.uuid;this.annotationInfo.origImageWidth=data.width;this.annotationInfo.origImageHeight=data.height;this.annotationInfo.validationId=data.validation.uuid;this.annotationInfo.imageUrl=data.url;this.annotationInfo.imageUnlocked=data.unlocked;if("auto_annotations"in data){if(data["auto_annotations"].length!==0)this.autoAnnotations=data["auto_annotations"]}setLabel(data.label.label,data.label.sublabel,data.label.accessor);changeNavHeader("default")}else{this.annotationInfo.imageId="";this.annotationInfo.origImageWidth=720;this.annotationInfo.origImageHeight=720;this.annotationInfo.validationId="";this.annotationInfo.imageUrl="";this.annotationInfo.imageUnlocked=false}showHideAutoAnnotationsLoadButton(this.autoAnnotations);if(this.canvas!==undefined&&this.canvas!==null){this.annotator.reset()}this.addMainCanvas();this.populateCanvas(getUrlFromImageUrl(this.annotationInfo.imageUrl,this.annotationInfo.imageUnlocked,this.annotationMode,this.labelAccessorsLookupTable),false);changeControl(this.annotator,this.annotationInfo.imageId);this.numOfPendingRequests=0;if(data===null)changeNavHeader("noimage");if(this.annotationMode==="browse"){if(this.browseModeLastSelectedAnnotatorMenuItem===null){if(this.annotator){this.annotationSettings.loadPreferedAnnotationTool(this.annotator);this.annotator.setPolygonVertexSize((new Settings).getPolygonVertexSize())}}else{this.changeMenuItem(this.browseModeLastSelectedAnnotatorMenuItem);this.annotator.setShape(this.browseModeLastSelectedAnnotatorMenuItem)}}else{if(this.annotator){this.annotationSettings.loadPreferedAnnotationTool(this.annotator);this.annotator.setPolygonVertexSize((new Settings).getPolygonVertexSize())}}if(this.annotationView==="unified"){this.unifiedModeLabels={};this.unifiedModeAnnotations={};if(this.annotationInfo.imageId!=="")this.populateUnifiedModeToolbox(this.annotationInfo.imageId)}populateRevisionsDropdown(0,0);showHideRevisionsDropdown()};AnnotationView.prototype.populateUnifiedModeToolbox=function(imageId){$("#unifiedModeLabelsLstLoadingIndicator").show();this.unifiedModePopulated=UnifiedModeStates.uninitialized;this.getAnnotationsForImage(imageId);this.getLabelsForImage(imageId,false);var labelRequests=[this.imageMonkeyApi.getAvailableLabels()];if(this.loggedIn)labelRequests.push(this.imageMonkeyApi.getLabelSuggestions(false));var inst=this;Promise.all(labelRequests).then((function(data){for(var key in data[0]){if(data[0].hasOwnProperty(key)){inst.availableLabels.push(key);inst.availableLabelsLookupTable[key]={uuid:data[0][key].uuid,label:key,sublabel:""}}if(data[0][key].has){for(var subkey in data[0][key].has){if(data[0][key].has.hasOwnProperty(subkey)){inst.availableLabels.push(subkey+"/"+key);inst.availableLabels[subkey+"/"+key]={uuid:data[0][key].has[subkey].uuid,label:key,sublabel:subkey}}}}}if(data.length>1){inst.availableLabels.push(...data[1])}inst.labelsAutoCompletion=new AutoCompletion("#addLabelsToUnifiedModeListLabels",inst.availableLabels)})).catch((function(e){Sentry.captureException(e)}))};AnnotationView.prototype.exec=function(){var inst=this;var lastActiveMenuItem="";$("#warningMsg").hide();$("#smartAnnotation").checkbox({onChange:function(){var enabled=isSmartAnnotationEnabled();if(enabled){inst.annotator.enableSmartAnnotation();$("#spacer").remove();$("#annotationColumn").show();$("#annotationColumn").prepend('<div class="eight wide center aligned column" id="smartAnnotationContainer">'+'<div class="" id="smartAnnotationCanvasWrapper">'+'<div class="ui dimmer" id="smartAnnotationDimmer">'+'<div class="ui loader">'+"</div>"+"</div>"+'<canvas id="smartAnnotationCanvas"></canvas>'+"</div>"+"</div>");inst.populateDetailedCanvas(true)}else{inst.annotator.disableSmartAnnotation();$("#smartAnnotationContainer").remove()}inst.addMainCanvas();inst.populateCanvas(inst.getUrlFromImageUrl(inst.annotationInfo.imageUrl,inst.annotationInfo.imageUnlocked,this.annotationMode,this.labelAccessorsLookupTable),false);showHideSmartAnnotationControls(enabled);showHideAutoAnnotationsLoadButton(inst.autoAnnotations)},beforeChecked:function(){if(canvasHasObjects(inst.canvas)>0){$("#discardChangesPopup").modal("show");return false}},beforeUnchecked:function(){if(canvasHasObjects(inst.canvas)>0){$("#discardChangesPopup").modal("show");return false}}});showHideSmartAnnotationControls(false);inst.colorPicker=new Huebee($("#colorPicker")[0],{});inst.colorPicker.on("change",(function(color,hue,sat,lum){inst.annotator.setStrokeColorOfSelected(color)}));$("#skipAnnotationDropdown").dropdown();Mousetrap.bind("r",(function(){$("#rectMenuItem").trigger("click")}));inst.annotationRefinementsContextMenu={data:[{header:"Refinements"},{text:"Add refinements",action:function(e,selector){e.preventDefault();if(inst.annotator.getIdOfSelectedItem()!==""){annotationRefinementsDlg.populateRefinements(inst.annotator.getRefinementsOfSelectedItem());annotationRefinementsDlg.open()}}}]};context.init({preventDoubleContext:false});$("#addAnnotationRefinementsDlgDoneButton").click((function(e){var refs=annotationRefinementsDlg.getSelectedRefinements().split(",");if(inst.annotationView==="unified"){$("#annotationPropertiesLst").empty();var allRefs=annotationRefinementsDlg.getRefinementsUuidMapping();for(var i=0;i<refs.length;i++){var refIcon="";if(refs[i]in allRefs)refIcon=allRefs[refs[i]].icon;addRefinementToRefinementsLst(allRefs[refs[i]].name,refs[i],refIcon)}}inst.annotator.setRefinements(refs)}));$("#rectMenuItem").click((function(e){if(inst.annotator!==undefined&&inst.annotator){inst.annotator.disablePanMode();inst.annotator.disableSelectMoveMode();inst.annotator.setShape("Rectangle");inst.changeMenuItem("Rectangle")}}));Mousetrap.bind("c",(function(){$("#circleMenuItem").trigger("click")}));$("#circleMenuItem").click((function(e){if(inst.annotator!==undefined&&inst.annotator){inst.annotator.disablePanMode();inst.annotator.disableSelectMoveMode();inst.annotator.setShape("Circle");inst.changeMenuItem("Circle")}}));Mousetrap.bind("p",(function(){$("#polygonMenuItem").trigger("click")}));Mousetrap.bind("s",(function(){$("#selectMoveMenutItem").trigger("click")}));$("#polygonMenuItem").click((function(e){if(inst.annotator!==undefined&&inst.annotator){inst.annotator.disablePanMode();inst.annotator.disableSelectMoveMode();inst.annotator.setShape("Polygon");inst.changeMenuItem("Polygon")}}));$("#selectMoveMenutItem").click((function(e){if(inst.annotator!==undefined&&inst.annotator){inst.annotator.disablePanMode();inst.annotator.setShape("");inst.annotator.enableSelectMoveMode();inst.changeMenuItem("SelectMove")}}));$("#freeDrawingMenuItem").click((function(e){if(inst.annotator!==undefined&&inst.annotator){inst.annotator.disablePanMode();inst.annotator.disableSelectMoveMode();inst.annotator.setShape("FreeDrawing");inst.annotator.setBrushColor("red");inst.changeMenuItem("FreeDrawing")}}));Mousetrap.bind("y",(function(){if(inst.deleteObjectsPopupShown)$("#deletedObjectsYesButton").trigger("click")}));Mousetrap.bind("n",(function(){if(inst.deleteObjectsPopupShown)$("#deleteObjectsPopup").modal("hide")}));Mousetrap.bind("del",(function(){$("#trashMenuItem").trigger("click")}));$("#trashMenuItem").click((function(e){if(isTrashMenuButtonEnabled()){$("#deleteObjectsPopup").modal({onShow:function(){inst.deleteObjectsPopupShown=true},onHidden:function(){inst.deleteObjectsPopupShown=false}}).modal("show")}}));$("#redoMenuItem").click((function(e){if(inst.annotator!==undefined)inst.annotator.redo()}));$("#undoMenuItem").click((function(e){if(inst.annotator!==undefined)inst.annotator.undo()}));Mousetrap.bind("+",(function(){zoomIn(inst.canvas)}));$("#zoomInMenuItem").click((function(e){zoomIn(inst.canvas)}));Mousetrap.bind("-",(function(){zoomOut(inst.canvas)}));$("#zoomOutMenuItem").click((function(e){zoomOut(inst.canvas)}));$("#removeLabelFromUnifiedModeLstDlgYesButton").click((function(e){var removedElemUuid=$("#removeLabelFromUnifiedModeLstDlg").attr("data-to-be-removed-uuid");$("#labellstitem-"+removedElemUuid).remove();if(removedElemUuid in inst.unifiedModeLabels){var toBeRemovedAnnotationId="";if(inst.unifiedModeLabels[removedElemUuid].sublabel!==undefined&&inst.unifiedModeLabels[removedElemUuid].sublabel!=="")toBeRemovedAnnotationId=inst.unifiedModeLabels[removedElemUuid].sublabel+"/"+inst.unifiedModeLabels[removedElemUuid].label;else toBeRemovedAnnotationId=inst.unifiedModeLabels[removedElemUuid].label;if(toBeRemovedAnnotationId in inst.unifiedModeAnnotations){delete inst.unifiedModeAnnotations[toBeRemovedAnnotationId];inst.annotator.deleteAll()}delete inst.unifiedModeLabels[removedElemUuid];var unifiedModeToolboxChildren=$("#annotationLabelsLst").children(".labelslstitem");var firstItem=unifiedModeToolboxChildren.first();if(firstItem&&firstItem.length===1)firstItem[0].click()}}));$("#removeAnnotationRefinementsDlgYesButton").click((function(e){$("#"+$("#removeAnnotationRefinementsDlg").attr("data-to-be-removed-id")).remove();var refs=inst.annotator.getRefinementsOfSelectedItem();var idx=refs.indexOf($("#removeAnnotationRefinementsDlg").attr("data-to-be-removed-id").replace("refinementlstitem-",""));if(idx>-1)refs.splice(idx,1);inst.annotator.setRefinements(refs)}));$("#isPluralButton").click((function(e){var pluralLabel=null;var currentLabel="";if($("#label").attr("sublabel")!=="")currentLabel=$("#label").attr("sublabel")+$("#label").attr("label");else currentLabel=$("#label").attr("label");if(inst.pluralLabels&&currentLabel in inst.pluralLabels){pluralLabel=inst.pluralLabels[currentLabel]}var isPluralButton=$("#isPluralButton");if(isPluralButton.hasClass("basic")){inst.pluralAnnotations=true;isPluralButton.removeClass("basic");isPluralButton.css("background-color","white");isPluralButton.removeClass("inverted");if(pluralLabel)$("#label").text("Annotate all: "+pluralLabel)}else{inst.pluralAnnotations=false;isPluralButton.removeClass("white");isPluralButton.addClass("basic");isPluralButton.addClass("inverted");$("#label").text("Annotate all: "+currentLabel)}}));$("#strokeWidthSlider").on("input",(function(e){var val=parseInt($(this).val());inst.annotator.setStrokeWidthOfSelected(val)}));Mousetrap.bind("ctrl",(function(e){if(!e.repeat){lastActiveMenuItem=getActiveAnnotationMenuItem(true);$("#panMenuItem").trigger("click")}}),"keydown");Mousetrap.bind("ctrl",(function(e){$("#"+lastActiveMenuItem).trigger("click")}),"keyup");$("#panMenuItem").click((function(e){if(inst.annotator!==undefined&&inst.annotator){inst.annotator.enablePanMode();inst.annotator.disableSelectMoveMode();inst.annotator.setShape("");inst.changeMenuItem("PanMode")}}));$("#blockSelectMenuItem").click((function(e){if(inst.annotator!==undefined&&inst.annotator){inst.annotator.disablePanMode();inst.annotator.disableSelectMoveMode();inst.annotator.setShape("Blocks");inst.changeMenuItem("BlockSelection");inst.annotator.toggleGrid()}}));$("#deletedObjectsYesButton").click((function(e){inst.annotator.deleteSelected();if(!inst.annotator.objectsSelected())$("#trashMenuItem").addClass("disabled")}));$("#smartAnnotationFgMenuItem").click((function(e){if(inst.annotator!==undefined&&inst.annotator){inst.changeMenuItem("ForegroundSelection");inst.annotator.disablePanMode();inst.annotator.disableSelectMoveMode();inst.annotator.setBrushColor("white");inst.annotator.setBrushWidth(10);inst.annotator.setShape("FreeDrawing")}}));$("#smartAnnotationBgMenuItem").click((function(e){if(inst.annotator!==undefined&&inst.annotator){inst.changeMenuItem("BackgroundSelection");inst.annotator.disablePanMode();inst.annotator.disableSelectMoveMode();inst.annotator.setBrushColor("black");inst.annotator.setBrushWidth(10);inst.annotator.setShape("FreeDrawing")}}));$("#loadAutoAnnotationsMenuItem").click((function(e){if(inst.autoAnnotations!==null&&!$("#loadAutoAnnotationsMenuItem").hasClass("disabled")){inst.annotator.loadAutoAnnotations(inst.autoAnnotations,getCanvasScaleFactor());$("#loadAutoAnnotationsMenuItem").addClass("disabled");$("#loadAutoAnnotationsMenuItem").removeClass("orange")}}));$("#discardChangesYesButton").click((function(e){inst.annotator.deleteAll();$("#smartAnnotation").checkbox("toggle")}));$("#showSmartAnnotationHelpDlg").click((function(){$("#smartAnnotationHelpDlgGif").attr("src","img/smart_annotation.gif");$("#smartAnnotationHelpDlg").modal("setting",{detachable:false}).modal("show")}));$("#settingsMenuItem").click((function(e){inst.annotationSettings.setAll();$("#annotationSettingsPopup").modal({onApprove:function(){if(!/^\d+$/.test($("#annotationPolygonVertexSizeInput").val())){$("#annotationSettingsPopupWarningMessageBoxContent").text("The polygon vertex size needs to be a numeric value!");$("#annotationSettingsPopupWarningMessageBox").show(200).delay(1500).hide(200);return false}inst.annotationSettings.persistAll();$("#annotationSettingsPopup").modal("hide");$("#annotationSettingsRefreshBrowserPopup").modal("show")}}).modal("show")}));$("#blacklistButton").click((function(e){if(!inst.loggedIn){$("#warningMsgText").text("You need to be logged in to perform this action.");$("#warningMsg").show(200).delay(1500).hide(200);return}if(inst.loggedIn){var blacklistAnnotationUsageDlgAlreadyShown=localStorage.getItem("blacklistAnnotationUsageDlgShown");if(blacklistAnnotationUsageDlgAlreadyShown===null){$("#blacklistAnnotationUsageDlg").modal("show");localStorage.setItem("blacklistAnnotationUsageDlgShown",true)}else{inst.blacklistAnnotation(inst.annotationInfo.validationId)}}else{$("#blacklistAnnotationUsageDlg").modal("show")}}));$("#blacklistAnnotationUsageDlgAcceptButton").click((function(e){$("#blacklistAnnotationUsageDlg").modal("hide");inst.blacklistAnnotation(inst.annotationInfo.validationId)}));$("#notAnnotableButton").click((function(e){var markAsUnannotatableUsageDlgAlreadyShown=localStorage.getItem("markAsUnannotatableUsageDlgShown");if(markAsUnannotatableUsageDlgAlreadyShown===null){$("#markAsUnannotatableUsageDlg").modal("show");localStorage.setItem("markAsUnannotatableUsageDlgShown",true)}else{inst.markAsNotAnnotatable(inst.annotationInfo.validationId)}}));$("#markAsUnannotatableUsageDlgAcceptButton").click((function(e){$("#markAsUnannotatableUsageDlg").modal("hide");inst.markAsNotAnnotatable(inst.annotationInfo.validationId)}));$("#doneButton").click((function(e){var res=null;if(inst.annotationView==="unified"){inst.saveCurrentSelectLabelInUnifiedModeList();if(Object.keys(inst.unifiedModeLabels).length===0&&Object.keys(inst.unifiedModeAnnotations).length===0){$("#warningMsgText").text("Please annotate the image first.");$("#warningMsg").show(200).delay(1500).hide(200);return}}else{res=inst.annotator.toJSON(inst.pluralAnnotations?annotationRefinementsDlg.getPluralAnnotationRefinementUuid():null);if(res.length===0){$("#warningMsgText").text("Please annotate the image first.");$("#warningMsg").show(200).delay(1500).hide(200);return}}if(isLoadingIndicatorVisible()){$("#warningMsgText").text("Smart Annotation is currently in progress.");$("#warningMsg").show(200).delay(1500).hide(200);return}e.preventDefault();if(inst.existingAnnotations!==null){inst.updateAnnotations(inst.annotator.toJSON())}else{if(inst.annotationView==="unified"){if(Object.keys(inst.unifiedModeLabels).length>0){var newlyAddedLabelsUnifiedMode=[];for(var key in inst.unifiedModeLabels){newlyAddedLabelsUnifiedMode.push(inst.unifiedModeLabels[key])}showHideControls(false,inst.annotationInfo.imageUnlocked);inst.imageMonkeyApi.labelImage(inst.annotationInfo.imageId,newlyAddedLabelsUnifiedMode).then((function(){inst.addAnnotationsUnifiedMode()})).catch((function(e){Sentry.captureException(e)}))}else{inst.addAnnotationsUnifiedMode()}}else{var annotations=[];var annotation={};annotation["annotations"]=res;annotation["label"]=$("#label").attr("label");annotation["sublabel"]=$("#label").attr("sublabel");annotations.push(annotation);inst.addAnnotations(annotations)}}}));$(window).bind("popstate",(function(){window.location.href=window.location.href}));changeNavHeader(inst.annotationMode);inst.populateDefaultsAndLoadData(inst.annotationMode,inst.validationId,inst.annotationRevision);try{(new Fingerprint2).get((function(result,components){inst.browserFingerprint=result}))}catch(e){}};return AnnotationView}();
\ No newline at end of file
+function isLoadingIndicatorVisible(){return $("#smartAnnotationDimmer").is(":visible")}function showHideAutoAnnotationsLoadButton(autoAnnotations){if(autoAnnotations&&autoAnnotations.length>0&&!isSmartAnnotationEnabled()){$("#loadAutoAnnotationsMenuItem").show();$("#loadAutoAnnotationsMenuItem").removeClass("disabled");$("#loadAutoAnnotationsMenuItem").addClass("orange")}else{$("#loadAutoAnnotationsMenuItem").hide()}}function canvasHasObjects(canvas){if(canvas.fabric().getObjects().length>0)return true;return false}function setLabel(label,sublabel,accessor){$("#label").attr("label",label);$("#label").attr("sublabel",sublabel);if(accessor!==null)$("#label").attr("accessor",accessor);if(sublabel===""){$("#label").text("Annotate all: "+label);$("#bottomLabel").text("Annotate all: "+label);$("#isPluralButton").attr("data-tooltip","Set in case you want to annotate multiple "+label+" objects at once")}else{$("#label").text("Annotate all: "+sublabel+"/"+label);$("#bottomLabel").text("Annotate all: "+sublabel+"/"+label);$("#isPluralButton").attr("data-tooltip","Set in case you want to annotate multiple "+sublabel+"/"+label+" objects at once")}}function changeControl(annotator,imageId){if(imageId===""){$("#labelContainer").hide();$("#doneButton").hide();$("#bottomLabel").hide();$("#isPluralContainer").hide();annotator.block()}else{$("#labelContainer").show();$("#doneButton").show();$("#bottomLabel").show();$("#isPluralContainer").show();annotator.unblock()}}function dataURItoBlob(dataURI){var byteString=atob(dataURI.split(",")[1]);var ab=new ArrayBuffer(byteString.length);var ia=new Uint8Array(ab);for(var i=0;i<byteString.length;i++){ia[i]=byteString.charCodeAt(i)}return new Blob([ab],{type:"image/png"})}function clearDetailedCanvas(detailedCanvas){if(detailedCanvas!==null){detailedCanvas.clear()}}function getCanvasScaleFactor(annotationInfo){var maxWidth=document.getElementById("annotationAreaContainer").clientWidth-50;var scaleFactor=maxWidth/annotationInfo.origImageWidth;if(scaleFactor>1)scaleFactor=1;return scaleFactor}function getUrlFromImageUrl(imageUrl,imageUnlocked,annotationMode,lookupTable){var url=imageUrl===""?"img/oops-no-annotation-left.png":imageUrl;if(imageUrl!==""){if(!imageUnlocked){url+="?token="+getCookie("imagemonkey")}if(annotationMode==="browse"){if($("#highlightParentAnnotationsCheckbox").checkbox("is checked")){var labelToAnnotate=$("#label").attr("accessor");if(labelToAnnotate in lookupTable){if(!imageUnlocked){url+="&highlight="+encodeURIComponent(lookupTable[labelToAnnotate])}else{url+="?highlight="+encodeURIComponent(lookupTable[labelToAnnotate])}}}}}return url}function showHideControls(show,imageUnlocked){if(show){$("#doneButton").show();$("#blacklistButton").show();$("#notAnnotableButton").show();$("#annotatorMenu").show();$("#smartAnnotation").show();$("#showSmartAnnotationHelpDlg").show();$("#annotationControlsGrid").show();$("#annotationControlsMainArea").show();$("#annotationButtons").show();$("#loadingSpinner").hide();if(imageUnlocked)$("#imageLockedLabel").hide();else $("#imageLockedLabel").show();$("#annotationColumnContent").show();$("#annotationColumnSpacer").show();$("#annotationPropertiesColumnSpacer").show()}else{$("#doneButton").hide();$("#blacklistButton").hide();$("#notAnnotableButton").hide();$("#annotatorMenu").hide();$("#smartAnnotation").hide();$("#showSmartAnnotationHelpDlg").hide();$("#annotationControlsGrid").hide();$("#annotationControlsMainArea").hide();$("#annotationButtons").hide();$("#loadingSpinner").show();$("#imageLockedLabel").hide();$("#annotationColumnContent").hide();$("#annotationColumnSpacer").hide();$("#annotationPropertiesColumnSpacer").hide()}}function showHideSmartAnnotationControls(show){if(show){$("#circleMenuItem").hide();$("#polygonMenuItem").hide();$("#smartAnnotationFgMenuItem").show();$("#smartAnnotationBgMenuItem").show()}else{$("#circleMenuItem").show();$("#polygonMenuItem").show();$("#smartAnnotationFgMenuItem").hide();$("#smartAnnotationBgMenuItem").hide()}$("#annotatorMenu .item").popup({inline:true,hoverable:true})}function isTrashMenuButtonEnabled(){return!$("#trashMenuItem").hasClass("disabled")}function isSmartAnnotationEnabled(){var obj=$("#smartAnnotation");if(obj.length){return obj.checkbox("is checked")}return false}function onLabelInLabelLstRemoveClicked(elem){$("#removeLabelFromUnifiedModeLstDlg").attr("data-to-be-removed-uuid",$(elem).parent().attr("data-uuid"));$("#removeLabelFromUnifiedModeLstDlg").modal("show")}function addLabelToLabelLst(label,sublabel,uuid,allowRemove=false,newlyCreated=false,isUnlocked=false,loggedIn=false,validationId=null){var id="labellstitem-"+uuid;var displayedLabel=sublabel===""?label:sublabel+"/"+label;if(allowRemove){displayedLabel='<span class="left-floated">'+displayedLabel+'</span><span class="right-floated" onclick="onLabelInLabelLstRemoveClicked(this);">'+'<i class="right icon delete ui red"></i></span>'}else{displayedLabel="<p>"+displayedLabel+"</p>"}var disabledStr=" ";var onClickCallback="annotationView.onLabelInLabelLstClicked(this);";var tooltip="";if(!isUnlocked&&!loggedIn){disabledStr=" disabled ";onClickCallback="";tooltip=' data-content="Please login to annotate this label"'}var validationIdStr="";if(validationId!==null)validationIdStr='" data-validation-uuid="'+validationId;var elem=$('<div class="ui'+disabledStr+'segment center aligned labelslstitem" id="'+id+'"'+tooltip+' data-label="'+label+'" data-uuid="'+uuid+'" data-sublabel="'+sublabel+'" data-newly-created="'+newlyCreated+validationIdStr+'" onclick="'+onClickCallback+'"'+" onmouseover=\"this.style.backgroundColor='#e6e6e6';\""+" onmouseout=\"this.style.backgroundColor='white';\""+' style="overflow: auto;">'+displayedLabel+"</div>");if(tooltip!==""){$(elem).popup({inline:true,hoverable:true,position:"bottom center",delay:{show:300,hide:300}})}$("#annotationLabelsLst").append(elem);return elem}function addRefinementToRefinementsLst(name,uuid,icon){var id="refinementlstitem-"+uuid;$("#annotationPropertiesLst").append('<div class="ui segment center aligned refinementlstitem" id="'+id+'"'+' data-uuid="'+uuid+'" onclick="onRefinementInRefinementsLstClicked(this);"'+"onmouseover=\"this.style.backgroundColor='#e6e6e6';\""+"onmouseout=\"this.style.backgroundColor='white';\""+'style="overflow: auto;">'+'<span class="left-floated">'+'<p><i class="'+icon+' icon"></i> '+name+"</p>"+'</span><span class="right-floated"><i class="right icon delete ui red"></i></span></div>')}function onRefinementInRefinementsLstClicked(elem){$("#removeAnnotationRefinementsDlg").attr("data-to-be-removed-id",$(elem).attr("id"));$("#removeAnnotationRefinementsDlg").modal("show")}function changeNavHeader(mode){if(mode==="default"){$("#labelContainer").css("margin-top","-2em");$("#navHeader").css("min-height","290px");$("#navHeader").show()}else if(mode==="noimage"){$("#labelContainer").css("margin-top","0");$("#navHeader").css("min-height","200px");$("#annotationControlsGrid").hide();$("#navHeader").show()}else{$("#labelContainer").css("margin-top","0");$("#navHeader").css("min-height","200px");$("#navHeader").show()}}function getActiveAnnotationMenuItem(ignoreAutoLoadButton){var ret="";$("#annotatorMenu").children().each((function(){if($(this).hasClass("active")){if(ignoreAutoLoadButton){if($(this).attr("id")!=="loadAutoAnnotationsMenuItem"){ret=$(this).attr("id");return}}else{ret=$(this).attr("id");return}}}));return ret}function zoomIn(canvas){canvas.fabric().setZoom(canvas.fabric().getZoom()*1.1)}function zoomOut(canvas){canvas.fabric().setZoom(canvas.fabric().getZoom()/1.1)}function AnnotationInfo(){this.imageId="";this.validationId="";this.origImageWidth=0;this.origImageHeight=0;this.annotationId="";this.imageUrl="";this.imageUnlocked=false}var UnifiedModeStates={uninitialized:0,fetchedLabels:1,fetchedAnnotations:2,initialized:3};var AnnotationView=function(){function AnnotationView(apiBaseUrl,playgroundBaseUrl,annotationMode,annotationView,annotationId,annotationRevision,validationId,loggedIn){this.annotationMode=annotationMode;this.annotationView=annotationView;this.loggedIn=loggedIn;this.apiBaseUrl=apiBaseUrl;this.playgroundBaseUrl=playgroundBaseUrl;this.annotationRevision=annotationRevision;this.validationId=validationId;this.annotationId=annotationId;this.imageMonkeyApi=new ImageMonkeyApi(this.apiBaseUrl);this.imageMonkeyApi.setToken(getCookie("imagemonkey"));this.canvas=null;this.annotator=null;this.detailedCanvas=null;this.numOfPendingRequests=0;this.autoAnnotations=null;this.labelId=null;this.annotationInfo=new AnnotationInfo;this.unifiedModePopulated=UnifiedModeStates.uninitialized;this.annotationSettings=new AnnotationSettings;this.colorPicker=null;this.existingAnnotations=null;this.browserFingerprint=null;this.deleteObjectsPopupShown=false;this.unifiedModeAnnotations={};this.unifiedModeLabels={};this.pluralAnnotations=false;this.pluralLabels=null;this.initializeLabelsLstAftLoadDelayed=false;this.browseModeLastSelectedAnnotatorMenuItem=null;this.annotationRefinementsContextMenu={};this.labelAccessorsLookupTable={};this.availableLabels=[];this.availableLabelsLookupTable={};this.labelsAutoCompletion=null}AnnotationView.prototype.setSentryDSN=function(sentryDSN){try{Sentry.init({dsn:sentryDSN})}catch(e){}};AnnotationView.prototype.handleUpdateAnnotationsRes=function(res){if(this.annotationMode==="browse"){$("#loadingSpinner").hide();this.updateAnnotationsForImage(this.annotationInfo.annotationId,res);showBrowseAnnotationImageGrid(null)}if(this.onlyOnce){showHideControls(false,this.annotationInfo.imageUnlocked);$("#onlyOnceDoneMessageContainer").show();$("#onlyOnceDoneMessage").fadeIn("slow");$("#loadingSpinner").hide()}};AnnotationView.prototype.onCanvasBackgroundImageSet=function(){if(isSmartAnnotationEnabled())this.populateDetailedCanvas();if(this.existingAnnotations!==null){this.annotator.loadAnnotations(this.existingAnnotations,this.canvas.fabric().backgroundImage.scaleX);this.existingAnnotations=this.annotator.toJSON()}showHideControls(true,this.annotationInfo.imageUnlocked);$("#annotationArea").css({"border-width":"1px","border-style":"solid","border-color":"#000000"});if(this.annotationView==="unified"){if(this.initializeLabelsLstAftLoadDelayed){this.selectLabelInUnifiedLabelsLstAfterLoad();this.initializeLabelsLstAftLoadDelayed=false}}};AnnotationView.prototype.loadAnnotatedImage=function(annotationId,annotationRevision){showHideControls(false,this.annotationInfo.imageUnlocked);var inst=this;this.imageMonkeyApi.getAnnotatedImage(annotationId,annotationRevision).then((function(data){inst.handleAnnotatedImageResponse(data);$("#blacklistButton").hide();$("#notAnnotableButton").hide()})).catch((function(e){Sentry.captureException(e)}))};AnnotationView.prototype.onAnnotatorObjectDeselected=function(){context.destroy("#annotationColumn");if(this.annotationView==="unified"){$("#annotationPropertiesLst").empty();$("#addRefinementButton").addClass("disabled");$("#addRefinementButtonTooltip").attr("data-tooltip","Select a annotation first")}};AnnotationView.prototype.onAnnotatorObjectSelected=function(){if(this.annotator.objectsSelected()){if(this.annotator.isSelectMoveModeEnabled()){$("#trashMenuItem").removeClass("disabled");$("#propertiesMenuItem").removeClass("disabled");var strokeColor=this.annotator.getStrokeColorOfSelected();if(strokeColor!==null)this.colorPicker.setColor(strokeColor);if(this.annotationView==="unified"){var refs=this.annotator.getRefinementsOfSelectedItem();var refsUuidMapping=annotationRefinementsDlg.getRefinementsUuidMapping();for(var i=0;i<refs.length;i++){if(refs[i]in refsUuidMapping){addRefinementToRefinementsLst(refsUuidMapping[refs[i]].name,refs[i],refsUuidMapping[refs[i]].icon)}}$("#addRefinementButton").removeClass("disabled");$("#addRefinementButtonTooltip").removeAttr("data-tooltip");context.attach("#annotationColumn",this.annotationRefinementsContextMenu.data)}}}else{$("#trashMenuItem").addClass("disabled");$("#propertiesMenuItem").addClass("disabled")}};AnnotationView.prototype.onAnnotatorMouseUp=function(){if(isSmartAnnotationEnabled()&&!this.annotator.isPanModeEnabled())this.grabCutMe()};AnnotationView.prototype.populateCanvas=function(backgroundImageUrl,initAnnotator,force=true){if(this.canvas!==null&&!force)this.annotator.reset();else{this.canvas=new CanvasDrawer("annotationArea");this.canvas.fabric().selection=false;this.annotator=new Annotator(this.canvas.fabric(),this.onAnnotatorObjectSelected.bind(this),this.onAnnotatorMouseUp.bind(this),this.onAnnotatorObjectDeselected.bind(this))}var scaleFactor=getCanvasScaleFactor(this.annotationInfo);var w=this.annotationInfo.origImageWidth*scaleFactor;var h=this.annotationInfo.origImageHeight*scaleFactor;$("#annotationAreaContainer").attr("width",w);$("#annotationAreaContainer").attr("height",h);$("#annotationAreaContainer").attr("scaleFactor",scaleFactor);this.canvas.setWidth(w);this.canvas.setHeight(h);if(initAnnotator){this.canvas.setCanvasBackgroundImageUrl(backgroundImageUrl,(function(){this.annotator.initHistory();this.onCanvasBackgroundImageSet()}))}else{this.canvas.setCanvasBackgroundImageUrl(backgroundImageUrl,this.onCanvasBackgroundImageSet.bind(this))}};AnnotationView.prototype.markAsNotAnnotatable=function(validationId){showHideControls(false,this.annotationInfo.imageUnlocked);var url=this.apiBaseUrl+"/v1/validation/"+validationId+"/not-annotatable";var inst=this;$.ajax({url:url,type:"POST",beforeSend:function(xhr){xhr.setRequestHeader("Authorization","Bearer "+getCookie("imagemonkey"))},success:function(data,status,xhr){if(inst.annotationMode==="default")inst.loadUnannotatedImage();else{$("#loadingSpinner").hide();clearDetailedCanvas(inst.detailedCanvas);inst.annotator.reset();showBrowseAnnotationImageGrid([validationId])}}})};AnnotationView.prototype.updateAnnotations=function(res){if(_.isEqual(res,this.existingAnnotations)){showHideControls(false,this.annotationInfo.imageUnlocked);clearDetailedCanvas(this.detailedCanvas);this.annotator.reset();this.handleUpdateAnnotationsRes(this.existingAnnotations);return}var postData={};postData["annotations"]=res;var headers={};if(this.browserFingerprint!==null)headers["X-Browser-Fingerprint"]=this.browserFingerprint;headers["X-App-Identifier"]=this.appIdentifier;showHideControls(false,this.annotationInfo.imageUnlocked);clearDetailedCanvas(this.detailedCanvas);this.annotator.reset();var url=this.apiBaseUrl+"/v1/annotation/"+this.annotationInfo.annotationId;var inst=this;$.ajax({url:url,type:"PUT",data:JSON.stringify(postData),headers:headers,beforeSend:function(xhr){xhr.setRequestHeader("Authorization","Bearer "+getCookie("imagemonkey"))},success:function(data){inst.handleUpdateAnnotationsRes(res)}})};AnnotationView.prototype.addAnnotationsUnifiedMode=function(){var validationIds=[];var annotations=[];for(var key in this.unifiedModeAnnotations){if(this.unifiedModeAnnotations.hasOwnProperty(key)){if(this.unifiedModeAnnotations[key].dirty){var annotation={};var entry=this.unifiedModeAnnotations[key];annotation["annotations"]=entry.annotations;annotation["label"]=entry.label;annotation["sublabel"]=entry.sublabel;annotations.push(annotation);if("validationUuid"in entry&&entry.validationUuid!==null)validationIds.push(entry.validationUuid)}}}this.unifiedModeLabels={};this.unifiedModeAnnotations={};this.addAnnotations(annotations,validationIds)};AnnotationView.prototype.addAnnotations=function(annotations,validationIds=null){var headers={};if(this.browserFingerprint!==null)headers["X-Browser-Fingerprint"]=this.browserFingerprint;headers["X-App-Identifier"]=this.appIdentifier;showHideControls(false,this.annotationInfo.imageUnlocked);clearDetailedCanvas(this.detailedCanvas);this.annotator.reset();if(annotations.length===0){this.onAddAnnotationsDone();return}var url=this.apiBaseUrl+"/v1/donation/"+this.annotationInfo.imageId+"/annotate";var inst=this;$.ajax({url:url,type:"POST",data:JSON.stringify(annotations),headers:headers,beforeSend:function(xhr){xhr.setRequestHeader("Authorization","Bearer "+getCookie("imagemonkey"))},success:function(data){inst.onAddAnnotationsDone(validationIds)}})};AnnotationView.prototype.onAddAnnotationsDone=function(validationIds=null){if(this.annotationMode==="default")this.loadUnannotatedImage();else{$("#loadingSpinner").hide();changeNavHeader("browse");showBrowseAnnotationImageGrid(validationIds)}if(this.onlyOnce){$("#onlyOnceDoneMessage").fadeIn("slow");showHideControls(false);$("#loadingSpinner").hide()}};AnnotationView.prototype.blacklistAnnotation=function(validationId){showHideControls(false,this.annotationInfo.imageUnlocked);var url=this.apiBaseUrl+"/v1/validation/"+validationId+"/blacklist-annotation";var inst=this;$.ajax({url:url,type:"POST",beforeSend:function(xhr){xhr.setRequestHeader("Authorization","Bearer "+getCookie("imagemonkey"))},success:function(data,status,xhr){if(inst.annotationMode==="default")inst.loadUnannotatedImage();else{$("#loadingSpinner").hide();clearDetailedCanvas(inst.detailedCanvas);inst.annotator.reset();showBrowseAnnotationImageGrid([validationId])}}})};AnnotationView.prototype.loadUnannotatedImage=function(validationId){showHideControls(false,this.annotationInfo.imageUnlocked);var inst=this;this.imageMonkeyApi.getUnannotatedImage(validationId,inst.labelId).then((function(data){inst.handleUnannotatedImageResponse(data)})).catch((function(){inst.handleUnannotatedImageResponse(null)}))};AnnotationView.prototype.getAnnotationInfo=function(){return this.annotationInfo};AnnotationView.prototype.populateDefaultsAndLoadData=function(){if(this.annotationMode==="browse")$("#loadingSpinner").show();var inst=this;Promise.all([this.imageMonkeyApi.getPluralLabels(),this.imageMonkeyApi.getLabelAccessors(true)]).then((function(data){inst.pluralLabels=data[0];for(var i=0;i<data[1].length;i++){inst.labelAccessorsLookupTable[data[1][i].accessor]=data[1][i].parent_accessor}if(inst.annotationMode==="default"){if(inst.validationId==="")inst.loadUnannotatedImage();else inst.loadUnannotatedImage(inst.validationId)}if(inst.annotationMode==="refine"){if(inst.annotationId!=="")inst.loadAnnotatedImage(inst.annotationId,inst.annotationRevision)}if(inst.annotationMode==="browse")$("#loadingSpinner").hide()})).catch((function(e){Sentry.captureException(e)}))};AnnotationView.prototype.saveCurrentSelectLabelInUnifiedModeList=function(){var key="";if($("#label").attr("sublabel")==="")key=$("#label").attr("label");else key=$("#label").attr("sublabel")+"/"+$("#label").attr("label");var currentSelectedValidationUuid=null;$("#annotationLabelsLst").children().each((function(i){if($(this).hasClass("grey inverted")){currentSelectedValidationUuid=$(this).attr("data-validation-uuid");return}}));var annos=null;if(key in this.unifiedModeAnnotations){if(this.annotator.isDirty()){annos=this.annotator.toJSON();this.unifiedModeAnnotations[key]={annotations:annos,label:$("#label").attr("label"),sublabel:$("#label").attr("sublabel"),validationUuid:currentSelectedValidationUuid,dirty:true}}}else{annos=this.annotator.toJSON();if(annos.length>0){this.unifiedModeAnnotations[key]={annotations:annos,label:$("#label").attr("label"),sublabel:$("#label").attr("sublabel"),validationUuid:currentSelectedValidationUuid,dirty:true}}}};AnnotationView.prototype.onLabelInLabelLstClicked=function(elem){var key="";this.saveCurrentSelectLabelInUnifiedModeList();$("#annotationLabelsLst").children().each((function(i){$(this).removeClass("grey inverted")}));setLabel($(elem).attr("data-label"),$(elem).attr("data-sublabel"),null);$(elem).addClass("grey inverted");this.annotator.deleteAll();key="";if($(elem).attr("data-sublabel")==="")key=$(elem).attr("data-label");else key=$(elem).attr("data-sublabel")+"/"+$(elem).attr("data-label");if(key in this.unifiedModeAnnotations){this.annotator.loadAnnotations(this.unifiedModeAnnotations[key].annotations,this.canvas.fabric().backgroundImage.scaleX)}};AnnotationView.prototype.populateDetailedCanvas=function(force=false){if(this.detailedCanvas!==null&&!force)this.detailedCanvas.clear();else this.detailedCanvas=new CanvasDrawer("smartAnnotationCanvas",0,0);var maxWidth=document.getElementById("smartAnnotationContainer").clientWidth-50;var scaleFactor=maxWidth/this.annotationInfo.origImageWidth;if(scaleFactor>1)scaleFactor=1;var w=this.annotationInfo.origImageWidth*scaleFactor;var h=this.annotationInfo.origImageHeight*scaleFactor;$("#smartAnnotationCanvasWrapper").attr("width",w);$("#smartAnnotationCanvasWrapper").attr("height",h);$("#smartAnnotationCanvasWrapper").attr("scaleFactor",scaleFactor);this.detailedCanvas.setWidth(w);this.detailedCanvas.setHeight(h);this.detailedCanvas.setCanvasBackgroundImage(this.canvas.fabric().backgroundImage,null)};AnnotationView.prototype.grabCutMe=function(){this.numOfPendingRequests+=1;$("#smartAnnotationCanvasWrapper").dimmer("show");var blob=dataURItoBlob(this.annotator.getMask());var formData=new FormData;formData.append("image",blob);formData.append("uuid",this.annotationInfo.imageId);var inst=this;$.ajax({url:inst.playgroundBaseUrl+"/v1/grabcut",processData:false,contentType:false,data:formData,type:"POST",success:function(data,status,xhr){inst.pollUntilProcessed(xhr.getResponseHeader("Location"))}})};AnnotationView.prototype.getLabelsForImage=function(imageId,onlyUnlockedLabels){var url=this.apiBaseUrl+"/v1/donation/"+imageId+"/labels?only_unlocked_labels="+(onlyUnlockedLabels?"true":"false");var inst=this;$.ajax({url:url,dataType:"json",type:"GET",beforeSend:function(xhr){xhr.setRequestHeader("Authorization","Bearer "+getCookie("imagemonkey"))},success:function(data){if(inst.annotationView==="unified"){if(data!==null){for(var i=0;i<data.length;i++){addLabelToLabelLst(data[i].label,"",data[i].uuid,false,false,data[i].unlocked,inst.loggedIn,data[i].validation.uuid);if(data[i].sublabels!==null){for(var j=0;j<data[i].sublabels.length;j++){addLabelToLabelLst(data[i].label,data[i].sublabels[j].name,data[i].sublabels[j].uuid,false,false,data[i].unlocked,inst.loggedIn,data[i].sublabels[j].validation.uuid)}}}}inst.unifiedModePopulated|=UnifiedModeStates.fetchedLabels;if(inst.unifiedModePopulated===UnifiedModeStates.initialized){if(inst.canvas.fabric().backgroundImage&&inst.canvas.fabric().backgroundImage!==undefined){inst.initializeLabelsLstAftLoadDelayed=false;inst.selectLabelInUnifiedLabelsLstAfterLoad()}else{inst.initializeLabelsLstAftLoadDelayed=true}}}},error:function(xhr,options,err){}})};AnnotationView.prototype.getAnnotationsForImage=function(imageId){var url="";if(this.annotationInfo.imageUnlocked)url=this.apiBaseUrl+"/v1/donation/"+imageId+"/annotations";else url=this.apiBaseUrl+"/v1/unverified-donation/"+imageId+"/annotations"+"?token="+getCookie("imagemonkey");var inst=this;$.ajax({url:url,dataType:"json",type:"GET",beforeSend:function(xhr){xhr.setRequestHeader("Authorization","Bearer "+getCookie("imagemonkey"))},success:function(data){if(inst.annotationView==="unified"){for(var i=0;i<data.length;i++){if(data[i].validation.sublabel!=="")inst.unifiedModeAnnotations[data[i].validation.sublabel+"/"+data[i].validation.label]={annotations:data[i].annotations,label:data[i].validation.label,sublabel:data[i].validation.sublabel,dirty:false};else{inst.unifiedModeAnnotations[data[i].validation.label]={annotations:data[i].annotations,label:data[i].validation.label,sublabel:data[i].validation.sublabel,dirty:false}}}inst.unifiedModePopulated|=UnifiedModeStates.fetchedAnnotations;if(inst.unifiedModePopulated===UnifiedModeStates.initialized){if(inst.canvas.fabric().backgroundImage&&inst.canvas.fabric().backgroundImage!==undefined){inst.initializeLabelsLstAftLoadDelayed=false;inst.selectLabelInUnifiedLabelsLstAfterLoad()}else{inst.initializeLabelsLstAftLoadDelayed=true}}}},error:function(xhr,options,err){}})};AnnotationView.prototype.selectLabelInUnifiedLabelsLstAfterLoad=function(){var unifiedModeToolboxChildren=$("#annotationLabelsLst").children(".labelslstitem");var foundLabelInUnifiedModeToolbox=false;unifiedModeToolboxChildren.each((function(index,value){if($(this).attr("data-label")===$("#label").attr("label")&&$(this).attr("data-sublabel")===$("#label").attr("sublabel")){foundLabelInUnifiedModeToolbox=true;$(this).click();return false}}));if(!foundLabelInUnifiedModeToolbox){var firstItem=unifiedModeToolboxChildren.first();if(firstItem&&firstItem.length===1)firstItem[0].click()}$("#unifiedModeLabelsLstLoadingIndicator").hide()};AnnotationView.prototype.handleAnnotatedImageResponse=function(data){this.annotationInfo.imageId=data.image.uuid;this.annotationInfo.origImageWidth=data.image.width;this.annotationInfo.origImageHeight=data.image.height;this.annotationInfo.annotationId=data.uuid;this.annotationInfo.imageUrl=data.image.url;this.annotationInfo.imageUnlocked=data.image.unlocked;this.initializeLabelsLstAftLoadDelayed=false;this.autoAnnotations=null;this.existingAnnotations=data["annotations"];showHideAutoAnnotationsLoadButton(this.autoAnnotations);setLabel(data.validation.label,data.validation.sublabel,null);if(this.canvas!==undefined&&this.canvas!==null){this.annotator.reset()}this.addMainCanvas();this.populateCanvas(getUrlFromImageUrl(data.image.url,data.image.unlocked,this.annotationMode,this.labelAccessorsLookupTable),false);changeControl(this.annotator,this.annotationInfo.imageId);this.numOfPendingRequests=0;showHideControls(true,this.annotationInfo.imageUnlocked);if(this.annotationMode==="browse"){if(this.browseModeLastSelectedAnnotatorMenuItem===null){if(this.annotator){this.annotationSettings.loadPreferedAnnotationTool(this,this.annotator);this.annotator.setPolygonVertexSize((new Settings).getPolygonVertexSize())}}else{this.changeMenuItem(this.browseModeLastSelectedAnnotatorMenuItem);this.annotator.setShape(this.browseModeLastSelectedAnnotatorMenuItem)}}else{if(this.annotator){this.annotationSettings.loadPreferedAnnotationTool(this,this.annotator);this.annotator.setPolygonVertexSize((new Settings).getPolygonVertexSize())}}populateRevisionsDropdown(data["num_revisions"],data["revision"]);showHideRevisionsDropdown();if(this.annotationView==="unified"){addLabelToLabelLst(data.validation.label,data.validation.sublabel,data.uuid,false,false,data.validation.unlocked,this.loggedIn);var firstItem=$("#annotationLabelsLst").children(".labelslstitem").first();if(firstItem&&firstItem.length===1){$(firstItem[0]).addClass("grey inverted")}$("#unifiedModeLabelsLstLoadingIndicator").hide()}var pushedUrl=window.location.pathname+"?annotation_id="+data.uuid;if(data.revision!==-1)pushedUrl+="&rev="+data.revision;if(this.annotationView==="unified")pushedUrl+="&view=unified";history.pushState({current_page:pushedUrl,previous_page:window.location.href},"",pushedUrl)};AnnotationView.prototype.changeMenuItem=function(type){var id="";if(type==="Rectangle")id="rectMenuItem";else if(type==="Circle")id="circleMenuItem";else if(type==="Polygon")id="polygonMenuItem";else if(type==="PanMode")id="panMenuItem";else if(type==="BlockSelection")id="blockSelectMenuItem";else if(type==="FreeDrawing")id="freeDrawingMenuItem";else if(type==="ForegroundSelection")id="smartAnnotationFgMenuItem";else if(type==="BackgroundSelection")id="smartAnnotationBgMenuItem";else if(type==="SelectMove")id="selectMoveMenutItem";if(this.annotationMode==="browse")this.browseModeLastSelectedAnnotatorMenuItem=type;$("#annotatorMenu").children().each((function(){if($(this).attr("id")===id)$(this).addClass("active");else $(this).removeClass("active")}))};AnnotationView.prototype.pollUntilProcessed=function(uuid){var url=this.playgroundBaseUrl+"/v1/grabcut/"+uuid;var inst=this;$.getJSON(url,(function(response){if(jQuery.isEmptyObject(response))setTimeout(inst.pollUntilProcessed(uuid),1e3);else{inst.detailedCanvas.clearObjects();if(response["result"]["points"].length>0){var data=[];data.push(response["result"]);inst.annotator.setSmartAnnotationData(data);inst.detailedCanvas.drawAnnotations(data,$("#smartAnnotationCanvasWrapper").attr("scaleFactor"))}inst.numOfPendingRequests-=1;if(inst.numOfPendingRequests<=0){$("#smartAnnotationCanvasWrapper").dimmer("hide");inst.numOfPendingRequests=0}}}))};AnnotationView.prototype.addMainCanvas=function(){$("#annotationColumnSpacer").remove();$("#annotationPropertiesColumnSpacer").remove();$("#annotationColumnContent").remove();var spacer="";var inst=this;var unifiedModePropertiesLst="";var w="sixteen";if(isSmartAnnotationEnabled()){w="eight"}else{var unifiedModePropertiesLstWidth="four";var workspaceSize=this.annotationSettings.loadWorkspaceSize();if(this.annotationView==="unified"){var spacerWidth="three";if(workspaceSize==="small"){w="eight";spacerWidth="four";unifiedModePropertiesLstWidth="four"}else if(workspaceSize==="medium"){w="eight";spacerWidth="four";unifiedModePropertiesLstWidth="four"}else if(workspaceSize==="big"){w="eight";spacerWidth="four";unifiedModePropertiesLstWidth="four"}var unifiedModeLabelsLstUiElems="";if(this.annotationMode!=="refine"){var showUnifiedModeLabelsLstUiElems=false;if(this.annotationMode==="default")showUnifiedModeLabelsLstUiElems=true;else{if(!$("#annotationsOnlyCheckbox").checkbox("is checked"))showUnifiedModeLabelsLstUiElems=true}if(showUnifiedModeLabelsLstUiElems){unifiedModeLabelsLstUiElems='<div class="ui center aligned grid">'+'<div class="twelve wide centered column">'+'<div class="ui form">'+'<div class="fields">'+'<div class="field">'+'<div class="ui search">'+'<div class="ui center aligned action input" id="addLabelToUnifiedModeListForm">'+'<div class="ui input">'+'<input placeholder="Enter label..." type="text" id="addLabelsToUnifiedModeListLabels" class="mousetrap">'+"</div>"+'<div class="ui button" id="addLabelToUnifiedModeListButton">Add</div>'+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"}}spacer='<div class="'+spacerWidth+' wide column" id="annotationColumnSpacer">'+'<h2 class="ui center aligned header">'+'<div class="content">'+"Labels"+"</div>"+"</h2>"+'<div class="ui basic segment">'+'<div class="ui segments">'+'<div class="ui raised segments" style="overflow: auto; height: 50vh;" id="annotationLabelsLst">'+'<div class="ui active indeterminate loader" id="unifiedModeLabelsLstLoadingIndicator"></div>'+"</div>"+unifiedModeLabelsLstUiElems+"</div>"+"</div>"+"</div>";unifiedModePropertiesLst='<div class="'+unifiedModePropertiesLstWidth+' wide column" id="annotationPropertiesColumnSpacer">'+'<h2 class="ui center aligned header">'+'<div class="content">'+"Properties"+"</div>"+"</h2>"+'<div class="ui basic segment">'+'<div class="ui segments">'+'<div class="ui raised segments" style="overflow: auto; height: 50vh;" id="annotationPropertiesLst">'+"</div>"+'<div class="ui center aligned grid">'+'<div class="twelve wide centered column">'+'<div class="ui form">'+'<div class="fields">'+'<div class="field">'+'<div class="ui search">'+'<div class="ui center aligned action input" id="addRefinementForm">'+'<div class="ui small search selection dropdown" id="addRefinementDropdown">'+'<div class="default text">Select Refinement</div>'+'<div class="menu" id="addRefinementDropdownMenu">'+"</div>"+"</div>"+'<div id="addRefinementButtonTooltip" data-tooltip="Select a annotation first" data-position="left center">'+'<div class="ui disabled button" id="addRefinementButton">Add</div>'+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"+"</div>"}else{if(workspaceSize==="small"){w="eight";spacer='<div class="four wide column" id="annotationColumnSpacer"></div>'}else if(workspaceSize==="medium"){w="ten";spacer='<div class="three wide column" id="annotationColumnSpacer"></div>'}else if(workspaceSize==="big")w="sixteen"}}var data=spacer+'<div class="'+w+' wide center aligned column" id="annotationColumnContent">'+'<div id="annotationAreaContainer">'+'<canvas id="annotationArea" imageId=""></canvas>'+"</div>"+"</div>"+unifiedModePropertiesLst;$("#annotationColumn").show();$("#annotationColumn").append(data);if(this.annotationView==="unified"){$("#addLabelToUnifiedModeListButton").click((function(e){var selectedElem=null;var labelName=escapeHtml($("#addLabelsToUnifiedModeListLabels").val());if(!inst.loggedIn){if(!(labelName in inst.availableLabelsLookupTable)){$("#warningMsgText").text("Please sign in first to add new labels!");$("#warningMsg").show(200).delay(1500).hide(200);return}}else{var pattern=new RegExp("^[a-zA-Z ]+$");if(!pattern.test(labelName)){$("#warningMsgText").text("Invalid label name "+labelName+". (supported characters: a-zA-Z and ' ')");$("#warningMsg").show(200).delay(1500).hide(200);return}}if(labelName in inst.availableLabelsLookupTable)selectedElem=inst.availableLabelsLookupTable[labelName];if(selectedElem===null){if(inst.loggedIn){var tempUuid=labelName.replace(/\s/g,"-");selectedElem={uuid:tempUuid,label:labelName,sublabel:"",newly_created:true}}else{$("#warningMsgText").text("Please sign in first to add new labels!");$("#warningMsg").show(200).delay(1500).hide(200);return}}var alreadyExistsInUnifiedModeLabelsLst=false;var elem;$("#annotationLabelsLst").children(".labelslstitem").each((function(idx){if($(this).attr("data-uuid")===selectedElem.uuid){alreadyExistsInUnifiedModeLabelsLst=true;elem=$(this);return false}if(selectedElem.uuid===labelName&&$(this).attr("data-label")===selectedElem.uuid&&$(this).attr("data-sublabel")===""){alreadyExistsInUnifiedModeLabelsLst=true;elem=$(this);return false}}));if(!alreadyExistsInUnifiedModeLabelsLst){if(selectedElem.sublabel!==""){inst.unifiedModeLabels[selectedElem.uuid]={label:selectedElem.label,sublabels:[{name:selectedElem.sublabel}],annotatable:true}}else{inst.unifiedModeLabels[selectedElem.uuid]={label:selectedElem.label,annotatable:true}}elem=addLabelToLabelLst(selectedElem.label,selectedElem.sublabel,selectedElem.uuid,true,true,false,inst.loggedIn,null)}inst.onLabelInLabelLstClicked(elem);$("#addLabelsToUnifiedModeListLabels").val("")}));$("#addRefinementButton").click((function(e){var refs=inst.annotator.getRefinementsOfSelectedItem();if(refs.indexOf($("#addRefinementDropdown").dropdown("get value"))==-1){refs.push($("#addRefinementDropdown").dropdown("get value"));inst.annotator.setRefinements(refs);var allRefs=annotationRefinementsDlg.getRefinementsUuidMapping();var refIcon="";if($("#addRefinementDropdown").dropdown("get value")in allRefs)refIcon=allRefs[$("#addRefinementDropdown").dropdown("get value")].icon;addRefinementToRefinementsLst($("#addRefinementDropdown").dropdown("get text"),$("#addRefinementDropdown").dropdown("get value"),refIcon)}$("#addRefinementDropdown").dropdown("restore placeholder text")}));var refs=annotationRefinementsDlg.getRefinementsUuidMapping();for(var k in refs){if(refs.hasOwnProperty(k)){var entry='<div class="item" data-value="'+k+'">';if(refs[k].icon!==""){entry+='<i class="'+refs[k].icon+' icon"></i>'}entry+=refs[k].name+"</div>";$("#addRefinementDropdownMenu").append(entry)}}$("#addRefinementDropdown").dropdown()}$("#annotationArea").attr("imageId",this.annotationInfo.imageId);$("#annotationArea").attr("origImageWidth",this.annotationInfo.origImageWidth);$("#annotationArea").attr("origImageHeight",this.annotationInfo.origImageHeight);$("#annotationArea").attr("validationId",this.annotationInfo.validationId)};AnnotationView.prototype.handleUnannotatedImageResponse=function(data){this.existingAnnotations=null;this.autoAnnotations=null;this.initializeLabelsLstAftLoadDelayed=false;if(data!==null){this.annotationInfo.imageId=data.uuid;this.annotationInfo.origImageWidth=data.width;this.annotationInfo.origImageHeight=data.height;this.annotationInfo.validationId=data.validation.uuid;this.annotationInfo.imageUrl=data.url;this.annotationInfo.imageUnlocked=data.unlocked;if("auto_annotations"in data){if(data["auto_annotations"].length!==0)this.autoAnnotations=data["auto_annotations"]}setLabel(data.label.label,data.label.sublabel,data.label.accessor);changeNavHeader("default")}else{this.annotationInfo.imageId="";this.annotationInfo.origImageWidth=720;this.annotationInfo.origImageHeight=720;this.annotationInfo.validationId="";this.annotationInfo.imageUrl="";this.annotationInfo.imageUnlocked=false}showHideAutoAnnotationsLoadButton(this.autoAnnotations);if(this.canvas!==undefined&&this.canvas!==null){this.annotator.reset()}this.addMainCanvas();this.populateCanvas(getUrlFromImageUrl(this.annotationInfo.imageUrl,this.annotationInfo.imageUnlocked,this.annotationMode,this.labelAccessorsLookupTable),false);changeControl(this.annotator,this.annotationInfo.imageId);this.numOfPendingRequests=0;if(data===null)changeNavHeader("noimage");if(this.annotationMode==="browse"){if(this.browseModeLastSelectedAnnotatorMenuItem===null){if(this.annotator){this.annotationSettings.loadPreferedAnnotationTool(this,this.annotator);this.annotator.setPolygonVertexSize((new Settings).getPolygonVertexSize())}}else{this.changeMenuItem(this.browseModeLastSelectedAnnotatorMenuItem);this.annotator.setShape(this.browseModeLastSelectedAnnotatorMenuItem)}}else{if(this.annotator){this.annotationSettings.loadPreferedAnnotationTool(this,this.annotator);this.annotator.setPolygonVertexSize((new Settings).getPolygonVertexSize())}}if(this.annotationView==="unified"){this.unifiedModeLabels={};this.unifiedModeAnnotations={};if(this.annotationInfo.imageId!=="")this.populateUnifiedModeToolbox(this.annotationInfo.imageId)}populateRevisionsDropdown(0,0);showHideRevisionsDropdown()};AnnotationView.prototype.populateUnifiedModeToolbox=function(imageId){$("#unifiedModeLabelsLstLoadingIndicator").show();this.unifiedModePopulated=UnifiedModeStates.uninitialized;this.getAnnotationsForImage(imageId);this.getLabelsForImage(imageId,false);var labelRequests=[this.imageMonkeyApi.getAvailableLabels()];if(this.loggedIn)labelRequests.push(this.imageMonkeyApi.getLabelSuggestions(false));var inst=this;Promise.all(labelRequests).then((function(data){for(var key in data[0]){if(data[0].hasOwnProperty(key)){inst.availableLabels.push(key);inst.availableLabelsLookupTable[key]={uuid:data[0][key].uuid,label:key,sublabel:""}}if(data[0][key].has){for(var subkey in data[0][key].has){if(data[0][key].has.hasOwnProperty(subkey)){inst.availableLabels.push(subkey+"/"+key);inst.availableLabels[subkey+"/"+key]={uuid:data[0][key].has[subkey].uuid,label:key,sublabel:subkey}}}}}if(data.length>1){inst.availableLabels.push(...data[1])}inst.labelsAutoCompletion=new AutoCompletion("#addLabelsToUnifiedModeListLabels",inst.availableLabels)})).catch((function(e){Sentry.captureException(e)}))};AnnotationView.prototype.exec=function(){var inst=this;var lastActiveMenuItem="";$("#warningMsg").hide();$("#smartAnnotation").checkbox({onChange:function(){var enabled=isSmartAnnotationEnabled();if(enabled){inst.annotator.enableSmartAnnotation();$("#spacer").remove();$("#annotationColumn").show();$("#annotationColumn").prepend('<div class="eight wide center aligned column" id="smartAnnotationContainer">'+'<div class="" id="smartAnnotationCanvasWrapper">'+'<div class="ui dimmer" id="smartAnnotationDimmer">'+'<div class="ui loader">'+"</div>"+"</div>"+'<canvas id="smartAnnotationCanvas"></canvas>'+"</div>"+"</div>");inst.populateDetailedCanvas(true)}else{inst.annotator.disableSmartAnnotation();$("#smartAnnotationContainer").remove()}inst.addMainCanvas();inst.populateCanvas(getUrlFromImageUrl(inst.annotationInfo.imageUrl,inst.annotationInfo.imageUnlocked,this.annotationMode,this.labelAccessorsLookupTable),false);showHideSmartAnnotationControls(enabled);showHideAutoAnnotationsLoadButton(inst.autoAnnotations)},beforeChecked:function(){if(canvasHasObjects(inst.canvas)>0){$("#discardChangesPopup").modal("show");return false}},beforeUnchecked:function(){if(canvasHasObjects(inst.canvas)>0){$("#discardChangesPopup").modal("show");return false}}});showHideSmartAnnotationControls(false);inst.colorPicker=new Huebee($("#colorPicker")[0],{});inst.colorPicker.on("change",(function(color,hue,sat,lum){inst.annotator.setStrokeColorOfSelected(color)}));$("#skipAnnotationDropdown").dropdown();Mousetrap.bind("r",(function(){$("#rectMenuItem").trigger("click")}));inst.annotationRefinementsContextMenu={data:[{header:"Refinements"},{text:"Add refinements",action:function(e,selector){e.preventDefault();if(inst.annotator.getIdOfSelectedItem()!==""){annotationRefinementsDlg.populateRefinements(inst.annotator.getRefinementsOfSelectedItem());annotationRefinementsDlg.open()}}}]};context.init({preventDoubleContext:false});$("#addAnnotationRefinementsDlgDoneButton").click((function(e){var refs=annotationRefinementsDlg.getSelectedRefinements().split(",");if(inst.annotationView==="unified"){$("#annotationPropertiesLst").empty();var allRefs=annotationRefinementsDlg.getRefinementsUuidMapping();for(var i=0;i<refs.length;i++){var refIcon="";if(refs[i]in allRefs)refIcon=allRefs[refs[i]].icon;addRefinementToRefinementsLst(allRefs[refs[i]].name,refs[i],refIcon)}}inst.annotator.setRefinements(refs)}));$("#rectMenuItem").click((function(e){if(inst.annotator!==undefined&&inst.annotator){inst.annotator.disablePanMode();inst.annotator.disableSelectMoveMode();inst.annotator.setShape("Rectangle");inst.changeMenuItem("Rectangle")}}));Mousetrap.bind("c",(function(){$("#circleMenuItem").trigger("click")}));$("#circleMenuItem").click((function(e){if(inst.annotator!==undefined&&inst.annotator){inst.annotator.disablePanMode();inst.annotator.disableSelectMoveMode();inst.annotator.setShape("Circle");inst.changeMenuItem("Circle")}}));Mousetrap.bind("p",(function(){$("#polygonMenuItem").trigger("click")}));Mousetrap.bind("s",(function(){$("#selectMoveMenutItem").trigger("click")}));$("#polygonMenuItem").click((function(e){if(inst.annotator!==undefined&&inst.annotator){inst.annotator.disablePanMode();inst.annotator.disableSelectMoveMode();inst.annotator.setShape("Polygon");inst.changeMenuItem("Polygon")}}));$("#selectMoveMenutItem").click((function(e){if(inst.annotator!==undefined&&inst.annotator){inst.annotator.disablePanMode();inst.annotator.setShape("");inst.annotator.enableSelectMoveMode();inst.changeMenuItem("SelectMove")}}));$("#freeDrawingMenuItem").click((function(e){if(inst.annotator!==undefined&&inst.annotator){inst.annotator.disablePanMode();inst.annotator.disableSelectMoveMode();inst.annotator.setShape("FreeDrawing");inst.annotator.setBrushColor("red");inst.changeMenuItem("FreeDrawing")}}));Mousetrap.bind("y",(function(){if(inst.deleteObjectsPopupShown)$("#deletedObjectsYesButton").trigger("click")}));Mousetrap.bind("n",(function(){if(inst.deleteObjectsPopupShown)$("#deleteObjectsPopup").modal("hide")}));Mousetrap.bind("del",(function(){$("#trashMenuItem").trigger("click")}));$("#trashMenuItem").click((function(e){if(isTrashMenuButtonEnabled()){$("#deleteObjectsPopup").modal({onShow:function(){inst.deleteObjectsPopupShown=true},onHidden:function(){inst.deleteObjectsPopupShown=false}}).modal("show")}}));$("#redoMenuItem").click((function(e){if(inst.annotator!==undefined)inst.annotator.redo()}));$("#undoMenuItem").click((function(e){if(inst.annotator!==undefined)inst.annotator.undo()}));Mousetrap.bind("+",(function(){zoomIn(inst.canvas)}));$("#zoomInMenuItem").click((function(e){zoomIn(inst.canvas)}));Mousetrap.bind("-",(function(){zoomOut(inst.canvas)}));$("#zoomOutMenuItem").click((function(e){zoomOut(inst.canvas)}));$("#removeLabelFromUnifiedModeLstDlgYesButton").click((function(e){var removedElemUuid=$("#removeLabelFromUnifiedModeLstDlg").attr("data-to-be-removed-uuid");$("#labellstitem-"+removedElemUuid).remove();if(removedElemUuid in inst.unifiedModeLabels){var toBeRemovedAnnotationId="";if(inst.unifiedModeLabels[removedElemUuid].sublabel!==undefined&&inst.unifiedModeLabels[removedElemUuid].sublabel!=="")toBeRemovedAnnotationId=inst.unifiedModeLabels[removedElemUuid].sublabel+"/"+inst.unifiedModeLabels[removedElemUuid].label;else toBeRemovedAnnotationId=inst.unifiedModeLabels[removedElemUuid].label;if(toBeRemovedAnnotationId in inst.unifiedModeAnnotations){delete inst.unifiedModeAnnotations[toBeRemovedAnnotationId];inst.annotator.deleteAll()}delete inst.unifiedModeLabels[removedElemUuid];var unifiedModeToolboxChildren=$("#annotationLabelsLst").children(".labelslstitem");var firstItem=unifiedModeToolboxChildren.first();if(firstItem&&firstItem.length===1)firstItem[0].click()}}));$("#removeAnnotationRefinementsDlgYesButton").click((function(e){$("#"+$("#removeAnnotationRefinementsDlg").attr("data-to-be-removed-id")).remove();var refs=inst.annotator.getRefinementsOfSelectedItem();var idx=refs.indexOf($("#removeAnnotationRefinementsDlg").attr("data-to-be-removed-id").replace("refinementlstitem-",""));if(idx>-1)refs.splice(idx,1);inst.annotator.setRefinements(refs)}));$("#isPluralButton").click((function(e){var pluralLabel=null;var currentLabel="";if($("#label").attr("sublabel")!=="")currentLabel=$("#label").attr("sublabel")+$("#label").attr("label");else currentLabel=$("#label").attr("label");if(inst.pluralLabels&&currentLabel in inst.pluralLabels){pluralLabel=inst.pluralLabels[currentLabel]}var isPluralButton=$("#isPluralButton");if(isPluralButton.hasClass("basic")){inst.pluralAnnotations=true;isPluralButton.removeClass("basic");isPluralButton.css("background-color","white");isPluralButton.removeClass("inverted");if(pluralLabel)$("#label").text("Annotate all: "+pluralLabel)}else{inst.pluralAnnotations=false;isPluralButton.removeClass("white");isPluralButton.addClass("basic");isPluralButton.addClass("inverted");$("#label").text("Annotate all: "+currentLabel)}}));$("#strokeWidthSlider").on("input",(function(e){var val=parseInt($(this).val());inst.annotator.setStrokeWidthOfSelected(val)}));Mousetrap.bind("ctrl",(function(e){if(!e.repeat){lastActiveMenuItem=getActiveAnnotationMenuItem(true);$("#panMenuItem").trigger("click")}}),"keydown");Mousetrap.bind("ctrl",(function(e){$("#"+lastActiveMenuItem).trigger("click")}),"keyup");$("#panMenuItem").click((function(e){if(inst.annotator!==undefined&&inst.annotator){inst.annotator.enablePanMode();inst.annotator.disableSelectMoveMode();inst.annotator.setShape("");inst.changeMenuItem("PanMode")}}));$("#blockSelectMenuItem").click((function(e){if(inst.annotator!==undefined&&inst.annotator){inst.annotator.disablePanMode();inst.annotator.disableSelectMoveMode();inst.annotator.setShape("Blocks");inst.changeMenuItem("BlockSelection");inst.annotator.toggleGrid()}}));$("#deletedObjectsYesButton").click((function(e){inst.annotator.deleteSelected();if(!inst.annotator.objectsSelected())$("#trashMenuItem").addClass("disabled")}));$("#smartAnnotationFgMenuItem").click((function(e){if(inst.annotator!==undefined&&inst.annotator){inst.changeMenuItem("ForegroundSelection");inst.annotator.disablePanMode();inst.annotator.disableSelectMoveMode();inst.annotator.setBrushColor("white");inst.annotator.setBrushWidth(10);inst.annotator.setShape("FreeDrawing")}}));$("#smartAnnotationBgMenuItem").click((function(e){if(inst.annotator!==undefined&&inst.annotator){inst.changeMenuItem("BackgroundSelection");inst.annotator.disablePanMode();inst.annotator.disableSelectMoveMode();inst.annotator.setBrushColor("black");inst.annotator.setBrushWidth(10);inst.annotator.setShape("FreeDrawing")}}));$("#loadAutoAnnotationsMenuItem").click((function(e){if(inst.autoAnnotations!==null&&!$("#loadAutoAnnotationsMenuItem").hasClass("disabled")){inst.annotator.loadAutoAnnotations(inst.autoAnnotations,getCanvasScaleFactor());$("#loadAutoAnnotationsMenuItem").addClass("disabled");$("#loadAutoAnnotationsMenuItem").removeClass("orange")}}));$("#discardChangesYesButton").click((function(e){inst.annotator.deleteAll();$("#smartAnnotation").checkbox("toggle")}));$("#showSmartAnnotationHelpDlg").click((function(){$("#smartAnnotationHelpDlgGif").attr("src","img/smart_annotation.gif");$("#smartAnnotationHelpDlg").modal("setting",{detachable:false}).modal("show")}));$("#settingsMenuItem").click((function(e){inst.annotationSettings.setAll();$("#annotationSettingsPopup").modal({onApprove:function(){if(!/^\d+$/.test($("#annotationPolygonVertexSizeInput").val())){$("#annotationSettingsPopupWarningMessageBoxContent").text("The polygon vertex size needs to be a numeric value!");$("#annotationSettingsPopupWarningMessageBox").show(200).delay(1500).hide(200);return false}inst.annotationSettings.persistAll();$("#annotationSettingsPopup").modal("hide");$("#annotationSettingsRefreshBrowserPopup").modal("show")}}).modal("show")}));$("#blacklistButton").click((function(e){if(!inst.loggedIn){$("#warningMsgText").text("You need to be logged in to perform this action.");$("#warningMsg").show(200).delay(1500).hide(200);return}if(inst.loggedIn){var blacklistAnnotationUsageDlgAlreadyShown=localStorage.getItem("blacklistAnnotationUsageDlgShown");if(blacklistAnnotationUsageDlgAlreadyShown===null){$("#blacklistAnnotationUsageDlg").modal("show");localStorage.setItem("blacklistAnnotationUsageDlgShown",true)}else{inst.blacklistAnnotation(inst.annotationInfo.validationId)}}else{$("#blacklistAnnotationUsageDlg").modal("show")}}));$("#blacklistAnnotationUsageDlgAcceptButton").click((function(e){$("#blacklistAnnotationUsageDlg").modal("hide");inst.blacklistAnnotation(inst.annotationInfo.validationId)}));$("#notAnnotableButton").click((function(e){var markAsUnannotatableUsageDlgAlreadyShown=localStorage.getItem("markAsUnannotatableUsageDlgShown");if(markAsUnannotatableUsageDlgAlreadyShown===null){$("#markAsUnannotatableUsageDlg").modal("show");localStorage.setItem("markAsUnannotatableUsageDlgShown",true)}else{inst.markAsNotAnnotatable(inst.annotationInfo.validationId)}}));$("#markAsUnannotatableUsageDlgAcceptButton").click((function(e){$("#markAsUnannotatableUsageDlg").modal("hide");inst.markAsNotAnnotatable(inst.annotationInfo.validationId)}));$("#doneButton").click((function(e){var res=null;if(inst.annotationView==="unified"){inst.saveCurrentSelectLabelInUnifiedModeList();if(Object.keys(inst.unifiedModeLabels).length===0&&Object.keys(inst.unifiedModeAnnotations).length===0){$("#warningMsgText").text("Please annotate the image first.");$("#warningMsg").show(200).delay(1500).hide(200);return}}else{res=inst.annotator.toJSON(inst.pluralAnnotations?annotationRefinementsDlg.getPluralAnnotationRefinementUuid():null);if(res.length===0){$("#warningMsgText").text("Please annotate the image first.");$("#warningMsg").show(200).delay(1500).hide(200);return}}if(isLoadingIndicatorVisible()){$("#warningMsgText").text("Smart Annotation is currently in progress.");$("#warningMsg").show(200).delay(1500).hide(200);return}e.preventDefault();if(inst.existingAnnotations!==null){inst.updateAnnotations(inst.annotator.toJSON())}else{if(inst.annotationView==="unified"){if(Object.keys(inst.unifiedModeLabels).length>0){var newlyAddedLabelsUnifiedMode=[];for(var key in inst.unifiedModeLabels){newlyAddedLabelsUnifiedMode.push(inst.unifiedModeLabels[key])}showHideControls(false,inst.annotationInfo.imageUnlocked);inst.imageMonkeyApi.labelImage(inst.annotationInfo.imageId,newlyAddedLabelsUnifiedMode).then((function(){inst.addAnnotationsUnifiedMode()})).catch((function(e){Sentry.captureException(e)}))}else{inst.addAnnotationsUnifiedMode()}}else{var annotations=[];var annotation={};annotation["annotations"]=res;annotation["label"]=$("#label").attr("label");annotation["sublabel"]=$("#label").attr("sublabel");annotations.push(annotation);inst.addAnnotations(annotations)}}}));$(window).bind("popstate",(function(){window.location.href=window.location.href}));changeNavHeader(inst.annotationMode);inst.populateDefaultsAndLoadData(inst.annotationMode,inst.validationId,inst.annotationRevision);try{(new Fingerprint2).get((function(result,components){inst.browserFingerprint=result}))}catch(e){}};return AnnotationView}();
\ No newline at end of file
diff --git a/js/imagemonkey/views/annotation_helper.js b/js/imagemonkey/views/annotation_helper.js
index bc0d9995..89a9e3a6 100644
--- a/js/imagemonkey/views/annotation_helper.js
+++ b/js/imagemonkey/views/annotation_helper.js
@@ -166,7 +166,7 @@ function isTrashMenuButtonEnabled() {
 }
 
 function isSmartAnnotationEnabled() {
-    var obj = $("smartAnnotation");
+    var obj = $("#smartAnnotation");
     if (obj.length) {
         return obj.checkbox("is checked");
     }
@@ -178,7 +178,8 @@ function onLabelInLabelLstRemoveClicked(elem) {
     $("#removeLabelFromUnifiedModeLstDlg").modal("show");
 }
 
-function addLabelToLabelLst(label, sublabel, uuid, allowRemove = false, newlyCreated = false, isUnlocked = false, loggedIn = false) {
+function addLabelToLabelLst(label, sublabel, uuid, allowRemove = false, newlyCreated = false,
+    isUnlocked = false, loggedIn = false, validationId = null) {
     var id = "labellstitem-" + uuid;
     var displayedLabel = ((sublabel === "") ? label : sublabel + "/" + label);
     if (allowRemove) {
@@ -198,10 +199,15 @@ function addLabelToLabelLst(label, sublabel, uuid, allowRemove = false, newlyCre
         tooltip = ' data-content="Please login to annotate this label"';
     }
 
+    var validationIdStr = '';
+    if (validationId !== null)
+        validationIdStr = '" data-validation-uuid="' + validationId;
+
     var elem = $('<div class="ui' + disabledStr + 'segment center aligned labelslstitem" id="' + id + '"' + tooltip +
         ' data-label="' + label + '" data-uuid="' + uuid +
         '" data-sublabel="' + sublabel +
         '" data-newly-created="' + newlyCreated +
+        validationIdStr +
         '" onclick="' + onClickCallback + '"' +
         ' onmouseover="this.style.backgroundColor=\'#e6e6e6\';"' +
         ' onmouseout="this.style.backgroundColor=\'white\';"' +
@@ -295,4 +301,4 @@ function AnnotationInfo() {
     this.annotationId = "";
     this.imageUrl = "";
     this.imageUnlocked = false;
-}
+}
\ No newline at end of file
diff --git a/src/api.go b/src/api.go
index 45287c2b..b5b6e509 100644
--- a/src/api.go
+++ b/src/api.go
@@ -441,12 +441,15 @@ func donate(c *gin.Context, db *imagemonkeydb.ImageMonkeyDatabase, username stri
 
 	e := db.AddDonatedPhoto(apiUser, imageInfo, autoUnlock, labelMeEntries,
 		imageCollectionName, labelMap, metalabels)
-	if e == imagemonkeydb.ImageDonationInternalError {
-		c.JSON(500, gin.H{"error": "Couldn't add photo - please try again later"})
-		return
-	} else if e == imagemonkeydb.ImageDonationImageCollectionDoesntExistError {
-		c.JSON(404, gin.H{"error": "Couldn't add photo - image collection doesn't exist"})
-		return
+	if e != nil {
+		switch e.(type) {
+		case *imagemonkeydb.InvalidImageCollectionInputError:
+			c.JSON(404, gin.H{"error": "Couldn't add photo - image collection doesn't exist"})
+			return
+		default:
+			c.JSON(500, gin.H{"error": "Couldn't add photo - please try again later"})
+			return
+		}
 	}
 
 	//get client IP address and try to determine country
@@ -2745,16 +2748,19 @@ func main() {
 				return
 			}
 
-			err := imageMonkeyDatabase.AddImageToImageCollection(apiUser, imageCollectionName, imageId)
-			if err == imagemonkeydb.AddImageToImageCollectionInternalError {
-				c.JSON(500, gin.H{"error": "Couldn't process request - please try again later"})
-				return
-			} else if err == imagemonkeydb.AddImageToImageCollectionInvalidInputError {
-				c.JSON(400, gin.H{"error": "Couldn't process request - invalid input"})
-				return
-			} else if err == imagemonkeydb.AddImageToImageCollectionDuplicateEntryError {
-				c.JSON(409, gin.H{"error": "Couldn't add image to collection - resource already exists"})
-				return
+			err := imageMonkeyDatabase.AddImageToImageCollection(apiUser, imageCollectionName, imageId, true)
+			if err != nil {
+				switch err.(type) {
+				case *imagemonkeydb.InvalidImageCollectionInputError:
+					c.JSON(400, gin.H{"error": "Couldn't process request - invalid input"})
+					return
+				case *imagemonkeydb.DuplicateImageCollectionError:
+					c.JSON(409, gin.H{"error": "Couldn't add image to collection - resource already exists"})
+					return
+				default:
+					c.JSON(500, gin.H{"error": "Couldn't process request - please try again later"})
+					return
+				}
 			}
 
 			c.JSON(201, nil)
@@ -2795,14 +2801,15 @@ func main() {
 			}
 
 			err := imageMonkeyDatabase.AddImageCollection(apiUser, imageCollection.Name, imageCollection.Description)
-			if err == imagemonkeydb.AddImageCollectionInternalError {
-				c.JSON(500, gin.H{"error": "Couldn't process request - please try again later"})
-				return
-			}
-
-			if err == imagemonkeydb.AddImageCollectionAlreadyExistsError {
-				c.JSON(409, gin.H{"error": "Couldn't process request - image collection already exists"})
-				return
+			if err != nil {
+				switch err.(type) {
+				case *imagemonkeydb.DuplicateImageCollectionError:
+					c.JSON(409, gin.H{"error": "Couldn't process request - image collection already exists"})
+					return
+				default:
+					c.JSON(500, gin.H{"error": "Couldn't process request - please try again later"})
+					return
+				}
 			}
 
 			c.JSON(201, nil)
diff --git a/src/commons/common.go b/src/commons/common.go
index d68157d9..69ccad42 100644
--- a/src/commons/common.go
+++ b/src/commons/common.go
@@ -466,31 +466,18 @@ func GetAvailableModels(s string) ([]json.RawMessage, error) {
 type AchievementsGenerator struct {
     achievements []datastructures.ImageHuntAchievement
 
-    numOfWeekendWarriorEntries int
-    lastAddedWeekendWarriorEntry time.Time
-
-    numOfNightOwlEntries int
-    lastAddedNightOwlEntry time.Time
-
-    numOfEarlyBirdEntries int
-    lastAddedEarlyBirdEntry time.Time
-
-    numOfCouchPotatoEntries int
-    lastAddedCouchPotatorEntry time.Time
-
-    numOfWorkerBeeEntries int
-    lastAddedWorkerBeeEntry time.Time
-
-    numOfAntEntries int
-    lastAddedAntEntry time.Time
-
-    numOfGreedySquirrelEntries int
-    lastAddedGreedySquirrelEntry time.Time
+    numOfAvailableLabels int
 
-    numOfImageMonkeyEntries int
-    lastAddedImageMonkeyEntry time.Time
+	hasWeekendWarriorBadge bool
+	hasEarlyBirdBadge bool
+	hasNightOwlBadge bool
+	hasCouchPotatoBadge bool
+	hasWorkerBeeBadge bool
+	hasAntBadge bool
+	hasGreedySquirrelBadge bool
+	hasImageMonkeyBadge bool
 
-    numOfAvailableLabels int
+	timestamps []time.Time
 }
 
 func NewAchievementsGenerator() *AchievementsGenerator {
@@ -520,163 +507,218 @@ func NewAchievementsGenerator() *AchievementsGenerator {
                                                                 Description: "Add an image for every label",
                                                                 Badge: "monkey.png"},
                                                          },
-        numOfWeekendWarriorEntries: 0,
-        numOfNightOwlEntries: 0,
-        numOfEarlyBirdEntries: 0,
-        numOfCouchPotatoEntries: 0,
-        numOfWorkerBeeEntries: 0,
-        numOfAntEntries: 0,
-        numOfGreedySquirrelEntries: 0,
-        numOfImageMonkeyEntries: 0,
-        numOfAvailableLabels: 0,
+
+		hasWeekendWarriorBadge: false,
+		hasEarlyBirdBadge: false,
+		hasNightOwlBadge: false,
+		hasCouchPotatoBadge: false,
+		hasWorkerBeeBadge: false,
+		hasAntBadge: false,
+		hasGreedySquirrelBadge: false,
+		hasImageMonkeyBadge: false,
+		timestamps: []time.Time{},
     } 
 }
 
-func (p *AchievementsGenerator) isConsecutiveDay(old time.Time, new time.Time) bool {
-    if old.IsZero() {
-        return true
-    }
-
-    if new.Equal(old.AddDate(0, 0, 1)) {
+func isConsecutiveDay(old time.Time, new time.Time) bool {
+    oldDate := time.Date(old.Year(), old.Month(), old.Day(), 0, 0, 0, 0, time.UTC)
+	newDate := time.Date(new.Year(), new.Month(), new.Day(), 0, 0, 0, 0, time.UTC)
+	
+	if newDate.Equal(oldDate.AddDate(0, 0, 1)) {
         return true
     }
     return false
 }
 
-func (p *AchievementsGenerator) SetNumOfAvailableLabels(numOfAvailableLabels int) {
-    p.numOfAvailableLabels = numOfAvailableLabels
-}
-
-func (p *AchievementsGenerator) Add(t time.Time) {
-    weekday := t.Weekday()
+func isSameDay(old time.Time, new time.Time) bool {
+	oldDate := time.Date(old.Year(), old.Month(), old.Day(), 0, 0, 0, 0, time.UTC)
+	newDate := time.Date(new.Year(), new.Month(), new.Day(), 0, 0, 0, 0, time.UTC)
 
-    //weekend warrior?
-    if (weekday == time.Sunday) || (weekday == time.Saturday) {
-        if p.isConsecutiveDay(p.lastAddedWeekendWarriorEntry, t) {
-            p.numOfWeekendWarriorEntries += 1
-            p.lastAddedWeekendWarriorEntry = t
-        } else {
-            p.numOfWeekendWarriorEntries = 0
-        }
-    }
-
-    //night owl?
-    hour, _, _ := t.Clock()
-    if hour >= 0 && hour <= 3 {
-        if p.isConsecutiveDay(p.lastAddedNightOwlEntry, t) {
-            p.numOfNightOwlEntries += 1
-            p.lastAddedNightOwlEntry = t
-        } else {
-            p.numOfNightOwlEntries = 0
-        }
-    }
-
-
-    //early bird? 
-    hour, _, _ = t.Clock()
-    if hour >= 5 && hour <= 7 {
-        if p.isConsecutiveDay(p.lastAddedEarlyBirdEntry, t) {
-            p.numOfEarlyBirdEntries += 1
-            p.lastAddedEarlyBirdEntry = t
-        } else {
-            p.numOfEarlyBirdEntries = 0
-        }
-    }
+	if newDate.Equal(oldDate) {
+		return true
+	}
+	return false
+}
 
-    //couch potato? 
-    hour, _, _ = t.Clock()
-    if hour >= 20 && hour <= 20 {
-        if p.isConsecutiveDay(p.lastAddedCouchPotatorEntry, t) {
-            p.numOfCouchPotatoEntries += 1
-            p.lastAddedCouchPotatorEntry = t
-        } else {
-            p.numOfCouchPotatoEntries = 0
-        }
-    }
+func isConsecutiveWeek(old time.Time, new time.Time) bool {
+	oldDate := time.Date(old.Year(), old.Month(), old.Day(), 0, 0, 0, 0, time.UTC)
+	newDate := time.Date(new.Year(), new.Month(), new.Day(), 0, 0, 0, 0, time.UTC)
 
-    //worker bee?
-    if p.isConsecutiveDay(p.lastAddedWorkerBeeEntry, t) {
-        p.numOfWorkerBeeEntries += 1
-        p.lastAddedWorkerBeeEntry = t
-    } else {
-        p.numOfWorkerBeeEntries = 0
+	
+    if newDate.Equal(oldDate.AddDate(0, 0, 7)) || newDate.Equal(oldDate.AddDate(0, 0, 8)) {
+		return true
     }
+    return false
+}
 
-    //ant?
-    if p.isConsecutiveDay(p.lastAddedAntEntry, t) {
-        p.numOfAntEntries += 1
-        p.lastAddedAntEntry = t
-    } else {
-        p.numOfAntEntries = 0
-    }
+func isSameWeek(old time.Time, new time.Time) bool {
+	oldDate := time.Date(old.Year(), old.Month(), old.Day(), 0, 0, 0, 0, time.UTC)
+	newDate := time.Date(new.Year(), new.Month(), new.Day(), 0, 0, 0, 0, time.UTC)
 
-    //greedy squirrel?
-    if p.isConsecutiveDay(p.lastAddedGreedySquirrelEntry, t) {
-        p.numOfGreedySquirrelEntries += 1
-        p.lastAddedGreedySquirrelEntry = t
-    } else {
-        p.numOfGreedySquirrelEntries = 0
+	
+    if newDate.Equal(oldDate.AddDate(0, 0, 0)) || newDate.Equal(oldDate.AddDate(0, 0, 1)) {
+		return true
     }
+    return false
+}
 
-    //image monkey?
-    if p.isConsecutiveDay(p.lastAddedImageMonkeyEntry, t) {
-        p.numOfImageMonkeyEntries += 1
-        p.lastAddedImageMonkeyEntry = t
-    } else {
-        p.numOfImageMonkeyEntries = 0
-    }
+func (p *AchievementsGenerator) SetNumOfAvailableLabels(numOfAvailableLabels int) {
+    p.numOfAvailableLabels = numOfAvailableLabels
+}
 
+func (p *AchievementsGenerator) Add(t time.Time) {
+	p.timestamps = append(p.timestamps, t)
+}
+
+func (p *AchievementsGenerator) calculateAchievements() {
+	numOfWeekendWarriorEntries := 0
+    var lastAddedWeekendWarriorEntry time.Time
+
+    numOfNightOwlEntries := 0
+    var lastAddedNightOwlEntry time.Time
+
+    numOfEarlyBirdEntries := 0
+    var lastAddedEarlyBirdEntry time.Time
+
+    numOfCouchPotatoEntries := 0
+    var lastAddedCouchPotatoEntry time.Time
+
+    numOfWorkerBeeEntries := 0
+    var lastAddedWorkerBeeEntry time.Time
+
+    numOfAntEntries := 0
+    var lastAddedAntEntry time.Time
+
+    numOfGreedySquirrelEntries := 0
+    var lastAddedGreedySquirrelEntry time.Time
+
+    numOfImageMonkeyEntries := 0
+
+	for _, t := range p.timestamps {
+		weekday := t.Weekday()
+
+		//weekend warrior?
+		if (weekday == time.Sunday) || (weekday == time.Saturday) {
+			if isConsecutiveWeek(lastAddedWeekendWarriorEntry, t) {
+				numOfWeekendWarriorEntries += 1
+
+				if numOfWeekendWarriorEntries >= 3 {
+					p.hasWeekendWarriorBadge = true
+				}
+			} else if !isSameWeek(lastAddedWeekendWarriorEntry, t) {
+				numOfWeekendWarriorEntries = 1
+			}
+			lastAddedWeekendWarriorEntry = t
+		}
+
+		//night owl?
+		hour, _, _ := t.Clock()
+		if hour >= 0 && hour <= 3 {
+			if isConsecutiveDay(lastAddedNightOwlEntry, t) {
+				numOfNightOwlEntries += 1
+
+				if numOfNightOwlEntries >= 3 {
+                	p.hasNightOwlBadge = true
+            	}
+			} else if !isSameDay(lastAddedNightOwlEntry, t) {
+				numOfNightOwlEntries = 1
+			}
+			lastAddedNightOwlEntry = t
+		}
+
+
+		//early bird? 
+		hour, _, _ = t.Clock()
+		if hour >= 5 && hour <= 7 {
+			if isConsecutiveDay(lastAddedEarlyBirdEntry, t) {
+				numOfEarlyBirdEntries += 1
+				if numOfEarlyBirdEntries >= 3 {
+                	p.hasEarlyBirdBadge = true
+            	}
+			} else if !isSameDay(lastAddedEarlyBirdEntry, t) {
+				numOfEarlyBirdEntries = 1
+			}
+			lastAddedEarlyBirdEntry = t
+		}
+
+		//couch potato? 
+		hour, _, _ = t.Clock()
+		if hour >= 20 && hour <= 20 {
+			if isConsecutiveDay(lastAddedCouchPotatoEntry, t) {
+				numOfCouchPotatoEntries += 1
+
+				if numOfCouchPotatoEntries >= 3 {
+                	p.hasCouchPotatoBadge = true
+            	}
+			} else if !isSameDay(lastAddedCouchPotatoEntry, t) {
+				numOfCouchPotatoEntries = 1
+			}
+			lastAddedCouchPotatoEntry = t
+		}
+
+		//worker bee?
+		if isConsecutiveDay(lastAddedWorkerBeeEntry, t) {
+			numOfWorkerBeeEntries += 1
+			if numOfWorkerBeeEntries >= 7 {
+                p.hasWorkerBeeBadge = true
+            }
+		} else if !isSameDay(lastAddedWorkerBeeEntry, t) {
+			numOfWorkerBeeEntries = 1
+		}
+		lastAddedWorkerBeeEntry = t
+
+		//ant?
+		if isConsecutiveDay(lastAddedAntEntry, t) {
+			numOfAntEntries += 1
+			if numOfAntEntries >= 30 {
+                p.hasAntBadge = true
+            }
+		} else if !isSameDay(lastAddedAntEntry, t) {
+			numOfAntEntries = 1
+		}
+		lastAddedAntEntry = t
+
+		//greedy squirrel?
+		if isConsecutiveDay(lastAddedGreedySquirrelEntry, t) {
+			numOfGreedySquirrelEntries += 1
+			if numOfGreedySquirrelEntries >= 60 {
+                p.hasGreedySquirrelBadge = true
+            }
+		} else if !isSameDay(lastAddedGreedySquirrelEntry, t) {
+			numOfGreedySquirrelEntries = 1
+		}
+		lastAddedGreedySquirrelEntry = t
+
+		//image monkey?
+		numOfImageMonkeyEntries += 1
+		if numOfImageMonkeyEntries == p.numOfAvailableLabels {
+			p.hasImageMonkeyBadge = true
+        }
+	}
 }
 
 func (p *AchievementsGenerator) GetAchievements(apiBaseUrl string) ([]datastructures.ImageHuntAchievement, error) {
-    achievements := p.achievements
+    p.calculateAchievements()
+	
+	achievements := p.achievements
     for key, val := range achievements {
 
         if val.Name == "Weekend Warrior" {
-            val.Accomplished = false
-            if p.numOfWeekendWarriorEntries >= 3 {
-                val.Accomplished = true
-            }
-
+            val.Accomplished = p.hasWeekendWarriorBadge
         } else if val.Name == "Early Bird" {
-            val.Accomplished = false
-            if p.numOfEarlyBirdEntries >= 3 {
-                val.Accomplished = true
-            }
-
+            val.Accomplished = p.hasEarlyBirdBadge
         } else if val.Name == "Night Owl" {
-            val.Accomplished = false
-            if p.numOfNightOwlEntries >= 3 {
-                val.Accomplished = true
-            }
-
+            val.Accomplished = p.hasNightOwlBadge
         } else if val.Name == "Couch Potato" {
-            val.Accomplished = false
-            if p.numOfCouchPotatoEntries >= 3 {
-                val.Accomplished = true
-            }
-
+            val.Accomplished = p.hasCouchPotatoBadge
         } else if val.Name == "Worker Bee" {
-            val.Accomplished = false
-            if p.numOfWorkerBeeEntries >= 7 {
-                val.Accomplished = true
-            }
+            val.Accomplished = p.hasWorkerBeeBadge
         } else if val.Name == "Ant Power" {
-            val.Accomplished = false
-            if p.numOfAntEntries >= 30 {
-                val.Accomplished = true
-            }
-
+            val.Accomplished = p.hasAntBadge
         } else if val.Name == "Greedy Squirrel" {
-            val.Accomplished = false
-            if p.numOfGreedySquirrelEntries >= 60 {
-                val.Accomplished = true
-            }
+            val.Accomplished = p.hasGreedySquirrelBadge 
         } else if val.Name == "Image Monkey" {
-            val.Accomplished = false
-            if p.numOfImageMonkeyEntries == p.numOfAvailableLabels {
-                val.Accomplished = true
-            }
+            val.Accomplished = p.hasImageMonkeyBadge 
         } else {
             return achievements, errors.New("Invalid entry")
         }
diff --git a/src/database/constants.go b/src/database/constants.go
new file mode 100644
index 00000000..55cf786f
--- /dev/null
+++ b/src/database/constants.go
@@ -0,0 +1,4 @@
+package imagemonkeydb
+
+const MyDonations = "my donations"
+const MyOpenTasks = "my open tasks"
diff --git a/src/database/error.go b/src/database/error.go
index cc9fe70c..3835bfa1 100644
--- a/src/database/error.go
+++ b/src/database/error.go
@@ -23,3 +23,19 @@ type AuthenticationRequiredError struct {
 func (e *AuthenticationRequiredError) Error() string {
 	return e.Description
 }
+
+type DuplicateImageCollectionError struct {
+	Description string
+}
+
+func (e *DuplicateImageCollectionError) Error() string {
+	return e.Description
+}
+
+type InvalidImageCollectionInputError struct {
+	Description string
+}
+
+func (e *InvalidImageCollectionInputError) Error() string {
+	return e.Description
+}
diff --git a/src/database/image.go b/src/database/image.go
index 15867273..652b5f44 100644
--- a/src/database/image.go
+++ b/src/database/image.go
@@ -1,204 +1,203 @@
 package imagemonkeydb
 
 import (
-    "github.com/getsentry/raven-go"
-    log "github.com/sirupsen/logrus"
-    datastructures "github.com/bbernhard/imagemonkey-core/datastructures"
 	"database/sql"
-    commons "github.com/bbernhard/imagemonkey-core/commons"
-    parser "github.com/bbernhard/imagemonkey-core/parser/v2"
+	"encoding/json"
+	"errors"
 	"fmt"
-    "errors"
-    "encoding/json"
-    "github.com/lib/pq"
-    "time"
+	commons "github.com/bbernhard/imagemonkey-core/commons"
+	datastructures "github.com/bbernhard/imagemonkey-core/datastructures"
+	parser "github.com/bbernhard/imagemonkey-core/parser/v2"
+	"github.com/getsentry/raven-go"
+	log "github.com/sirupsen/logrus"
+	"time"
 )
 
 type ImageDonationErrorType int
+
 const (
-  ImageDonationSuccess ImageDonationErrorType = 1 << iota
-  ImageDonationImageCollectionDoesntExistError
-  ImageDonationInternalError
+	ImageDonationSuccess ImageDonationErrorType = 1 << iota
+	ImageDonationImageCollectionDoesntExistError
+	ImageDonationInternalError
 )
 
 func sublabelsToStringlist(sublabels []datastructures.Sublabel) []string {
-    var s []string
-    for _, sublabel := range sublabels {
-        s = append(s, sublabel.Name)
-    }
+	var s []string
+	for _, sublabel := range sublabels {
+		s = append(s, sublabel.Name)
+	}
 
-    return s
+	return s
 }
 
 func _addImageSource(imageId int64, imageSource datastructures.ImageSource, tx *sql.Tx) (int64, error) {
-    var insertedId int64
-    err := tx.QueryRow("INSERT INTO image_source(image_id, url) VALUES($1, $2) RETURNING id", imageId, imageSource.Url).Scan(&insertedId)
-    if err != nil {
-        tx.Rollback()
-        log.Debug("[Add image source] Couldn't add image source: ", err.Error())
-        raven.CaptureError(err, nil)
-        return insertedId, err
-    }
-
-    return insertedId, nil
+	var insertedId int64
+	err := tx.QueryRow("INSERT INTO image_source(image_id, url) VALUES($1, $2) RETURNING id", imageId, imageSource.Url).Scan(&insertedId)
+	if err != nil {
+		tx.Rollback()
+		log.Debug("[Add image source] Couldn't add image source: ", err.Error())
+		raven.CaptureError(err, nil)
+		return insertedId, err
+	}
+
+	return insertedId, nil
 }
 
-//returns a list of n - random images (n = limit) that were uploaded with the given label. 
+//returns a list of n - random images (n = limit) that were uploaded with the given label.
 func (p *ImageMonkeyDatabase) GetRandomGroupedImages(label string, limit int) ([]datastructures.ValidationImage, error) {
-    var images []datastructures.ValidationImage
-
-    tx, err := p.db.Begin()
-    if err != nil {
-        log.Debug("[Random grouped images] Couldn't begin transaction: ", err.Error())
-        raven.CaptureError(err, nil)
-        return images, err
-    }
-
-    //get number of images for a given label. we need that to calculate a random number between
-    //0 and (numOfImages - limit). If (numOfImages - limit) < 0 then offset = 0.
-
-    //TODO: the following SQL query is a potential candidate for improvement, as it probably gets slow if there
-    //are ten thousands of rows in the DB.
-    var numOfRows int
-    err = tx.QueryRow(`SELECT count(*) FROM image i 
+	var images []datastructures.ValidationImage
+
+	tx, err := p.db.Begin()
+	if err != nil {
+		log.Debug("[Random grouped images] Couldn't begin transaction: ", err.Error())
+		raven.CaptureError(err, nil)
+		return images, err
+	}
+
+	//get number of images for a given label. we need that to calculate a random number between
+	//0 and (numOfImages - limit). If (numOfImages - limit) < 0 then offset = 0.
+
+	//TODO: the following SQL query is a potential candidate for improvement, as it probably gets slow if there
+	//are ten thousands of rows in the DB.
+	var numOfRows int
+	err = tx.QueryRow(`SELECT count(*) FROM image i 
                         JOIN image_provider p ON i.image_provider_id = p.id 
                         JOIN image_validation v ON v.image_id = i.id
                         JOIN label l ON v.label_id = l.id
                         WHERE i.unlocked = true AND p.name = 'donation' AND l.name = $1 AND l.parent_id is null`, label).Scan(&numOfRows)
-    if err != nil {
-        tx.Rollback()
-        log.Debug("[Random grouped images] Couldn't get num of rows: ", err.Error())
-        raven.CaptureError(err, nil)
-        return images, err
-    }
-
-    randomNumber := 0
-    end := numOfRows - limit
-    if end < 0 {
-        end = 0
-    } 
-
-    if end != 0 {
-        randomNumber = commons.Random(0, end)
-    }
-
-    //fetch images
-    rows, err := p.db.Query(`SELECT i.key, l.name, v.num_of_valid, v.num_of_invalid, v.uuid FROM image i 
+	if err != nil {
+		tx.Rollback()
+		log.Debug("[Random grouped images] Couldn't get num of rows: ", err.Error())
+		raven.CaptureError(err, nil)
+		return images, err
+	}
+
+	randomNumber := 0
+	end := numOfRows - limit
+	if end < 0 {
+		end = 0
+	}
+
+	if end != 0 {
+		randomNumber = commons.Random(0, end)
+	}
+
+	//fetch images
+	rows, err := p.db.Query(`SELECT i.key, l.name, v.num_of_valid, v.num_of_invalid, v.uuid FROM image i 
                            JOIN image_provider p ON i.image_provider_id = p.id 
                            JOIN image_validation v ON v.image_id = i.id
                            JOIN label l ON v.label_id = l.id
                            WHERE i.unlocked = true AND p.name = 'donation' AND l.name = $1 AND l.parent_id is null
                            OFFSET $2 LIMIT $3`, label, randomNumber, limit)
 
-    if err != nil {
-        tx.Rollback()
-        log.Debug("[Random grouped images] Couldn't get images: ", err.Error())
-        raven.CaptureError(err, nil)
-        return images, err
-    }
-
-    defer rows.Close()
-
-    for rows.Next() {
-        var image datastructures.ValidationImage
-        image.Provider = "donation"
-        err = rows.Scan(&image.Id, &image.Label, &image.Validation.NumOfValid, &image.Validation.NumOfInvalid, &image.Validation.Id)
-        if err != nil {
-            tx.Rollback()
-            log.Debug("[Fetch random grouped image] Couldn't scan row: ", err.Error())
-            raven.CaptureError(err, nil)
-            return images, err
-        }
-
-        images = append(images, image)
-    }
-
-    return images, tx.Commit()
-}
+	if err != nil {
+		tx.Rollback()
+		log.Debug("[Random grouped images] Couldn't get images: ", err.Error())
+		raven.CaptureError(err, nil)
+		return images, err
+	}
 
+	defer rows.Close()
+
+	for rows.Next() {
+		var image datastructures.ValidationImage
+		image.Provider = "donation"
+		err = rows.Scan(&image.Id, &image.Label, &image.Validation.NumOfValid, &image.Validation.NumOfInvalid, &image.Validation.Id)
+		if err != nil {
+			tx.Rollback()
+			log.Debug("[Fetch random grouped image] Couldn't scan row: ", err.Error())
+			raven.CaptureError(err, nil)
+			return images, err
+		}
+
+		images = append(images, image)
+	}
+
+	return images, tx.Commit()
+}
 
 func (p *ImageMonkeyDatabase) UnlockImage(imageId string) error {
-    _,err := p.db.Exec("UPDATE image SET unlocked = true WHERE key = $1", imageId)
-    if err != nil {
-        log.Debug("[Unlock Image] Couldn't unlock image: ", err.Error())
-        raven.CaptureError(err, nil)
-        return err
-    }
-
-    return nil
+	_, err := p.db.Exec("UPDATE image SET unlocked = true WHERE key = $1", imageId)
+	if err != nil {
+		log.Debug("[Unlock Image] Couldn't unlock image: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
+	}
+
+	return nil
 }
 
 func (p *ImageMonkeyDatabase) PutImageInQuarantine(imageId string) error {
-    _,err := p.db.Exec(`INSERT INTO image_quarantine(image_id)
+	_, err := p.db.Exec(`INSERT INTO image_quarantine(image_id)
                         SELECT id FROM image WHERE key = $1
                         ON CONFLICT(image_id) DO NOTHING`, imageId)
-    if err != nil {
-        log.Debug("[Put Image in Quarantine] Couldn't put image in quarantine: ", err.Error())
-        raven.CaptureError(err, nil)
-        return err
-    }
+	if err != nil {
+		log.Debug("[Put Image in Quarantine] Couldn't put image in quarantine: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
+	}
 
-    return nil
+	return nil
 }
 
 func (p *ImageMonkeyDatabase) IsImageUnlocked(uuid string) (bool, error) {
-    var unlocked bool
-    unlocked = false
-    rows, err := p.db.Query("SELECT unlocked FROM image WHERE key = $1", uuid)
-    if err != nil {
-        log.Debug("[Is Image Unlocked] Couldn't get row: ", err.Error())
-        raven.CaptureError(err, nil)
-        return false, err
-    }
-
-    defer rows.Close()
-
-    if rows.Next() {
-        err = rows.Scan(&unlocked)
-        if err != nil {
-            log.Debug("[Is Image Unlocked] Couldn't scan row: ", err.Error())
-            raven.CaptureError(err, nil)
-            return false, err
-        }
-    }
-
-    return unlocked, nil
+	var unlocked bool
+	unlocked = false
+	rows, err := p.db.Query("SELECT unlocked FROM image WHERE key = $1", uuid)
+	if err != nil {
+		log.Debug("[Is Image Unlocked] Couldn't get row: ", err.Error())
+		raven.CaptureError(err, nil)
+		return false, err
+	}
+
+	defer rows.Close()
+
+	if rows.Next() {
+		err = rows.Scan(&unlocked)
+		if err != nil {
+			log.Debug("[Is Image Unlocked] Couldn't scan row: ", err.Error())
+			raven.CaptureError(err, nil)
+			return false, err
+		}
+	}
+
+	return unlocked, nil
 }
 
 func (p *ImageMonkeyDatabase) ImageExists(hash uint64) (bool, error) {
-    //PostgreSQL can't handle unsigned 64bit, so we are casting the hash to a signed 64bit value when comparing against the stored hash (so values above maxuint64/2 are negative). 
-    rows, err := p.db.Query("SELECT COUNT(hash) FROM image where hash = $1", int64(hash))
-    if err != nil {
-        log.Debug("[Checking if photo exists] Couldn't get hash: ", err.Error())
-        raven.CaptureError(err, nil)
-        return false, err
-    }
-    defer rows.Close()
-
-    var numOfOccurences int
-    if rows.Next() {
-        err = rows.Scan(&numOfOccurences)
-        if err != nil {
-            log.Debug("[Checking if photo exists] Couldn't scan row: ", err.Error())
-            raven.CaptureError(err, nil)
-            return false, err
-        }
-    }
-
-    if numOfOccurences > 0 {
-        return true, nil
-    } else{
-        return false, nil
-    }
+	//PostgreSQL can't handle unsigned 64bit, so we are casting the hash to a signed 64bit value when comparing against the stored hash (so values above maxuint64/2 are negative).
+	rows, err := p.db.Query("SELECT COUNT(hash) FROM image where hash = $1", int64(hash))
+	if err != nil {
+		log.Debug("[Checking if photo exists] Couldn't get hash: ", err.Error())
+		raven.CaptureError(err, nil)
+		return false, err
+	}
+	defer rows.Close()
+
+	var numOfOccurences int
+	if rows.Next() {
+		err = rows.Scan(&numOfOccurences)
+		if err != nil {
+			log.Debug("[Checking if photo exists] Couldn't scan row: ", err.Error())
+			raven.CaptureError(err, nil)
+			return false, err
+		}
+	}
+
+	if numOfOccurences > 0 {
+		return true, nil
+	} else {
+		return false, nil
+	}
 }
 
 func (p *ImageMonkeyDatabase) ImageExistsForUser(imageId string, username string) (bool, error) {
-    var queryValues []interface{}
-    queryValues = append(queryValues, imageId)
+	var queryValues []interface{}
+	queryValues = append(queryValues, imageId)
 
-    includeOwnImageDonations := ""
-    if username != "" {
-        includeOwnImageDonations = `OR (
+	includeOwnImageDonations := ""
+	if username != "" {
+		includeOwnImageDonations = `OR (
                                         EXISTS 
                                         (
                                             SELECT 1 
@@ -213,152 +212,150 @@ func (p *ImageMonkeyDatabase) ImageExistsForUser(imageId string, username string
                                             WHERE q.image_id = i.id 
                                         )
                                        )`
-        queryValues = append(queryValues, username)
-        
-    }
+		queryValues = append(queryValues, username)
 
-    q := fmt.Sprintf(`SELECT COUNT(i.id) FROM image i 
+	}
+
+	q := fmt.Sprintf(`SELECT COUNT(i.id) FROM image i 
                       WHERE i.key = $1 AND (i.unlocked = true %s)`, includeOwnImageDonations)
-    var num int = 0
-    err := p.db.QueryRow(q, queryValues...).Scan(&num)
-    if err != nil {
-        log.Error("[Image exists for user] Couldn't determine whether image exists: ", err.Error())
-        raven.CaptureError(err, nil)
-        return false, err
-    }
-
-    if num > 0 {
-        return true, nil
-    }
-    return false, nil
+	var num int = 0
+	err := p.db.QueryRow(q, queryValues...).Scan(&num)
+	if err != nil {
+		log.Error("[Image exists for user] Couldn't determine whether image exists: ", err.Error())
+		raven.CaptureError(err, nil)
+		return false, err
+	}
+
+	if num > 0 {
+		return true, nil
+	}
+	return false, nil
 }
 
-func (p *ImageMonkeyDatabase) AddDonatedPhoto(apiUser datastructures.APIUser, imageInfo datastructures.ImageInfo, autoUnlock bool, 
-                                              labels []datastructures.LabelMeEntry, imageCollectionName string, labelMap map[string]datastructures.LabelMapEntry, 
-                                              metalabels *commons.MetaLabels) ImageDonationErrorType {
+func (p *ImageMonkeyDatabase) AddDonatedPhoto(apiUser datastructures.APIUser, imageInfo datastructures.ImageInfo, autoUnlock bool,
+	labels []datastructures.LabelMeEntry, imageCollectionName string, labelMap map[string]datastructures.LabelMapEntry,
+	metalabels *commons.MetaLabels) error {
 	tx, err := p.db.Begin()
-    if err != nil {
-    	log.Debug("[Adding donated photo] Couldn't begin transaction: ", err.Error())
-        raven.CaptureError(err, nil)
-        return ImageDonationInternalError
-    }
-
-    imageProvider := imageInfo.Source.Provider
-    if imageProvider == "imagehunt" {
-        imageProvider = "donation"
-    }
+	if err != nil {
+		log.Debug("[Adding donated photo] Couldn't begin transaction: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
+	}
 
+	imageProvider := imageInfo.Source.Provider
+	if imageProvider == "imagehunt" {
+		imageProvider = "donation"
+	}
 
-    //PostgreSQL can't store unsigned 64bit, so we are casting the hash to a signed 64bit value when storing the hash (so values above maxuint64/2 are negative). 
-    //this should be ok, as we do not need to order those values, but just need to check if a hash exists. So it should be fine
-	var imageId int64 
+	//PostgreSQL can't store unsigned 64bit, so we are casting the hash to a signed 64bit value when storing the hash (so values above maxuint64/2 are negative).
+	//this should be ok, as we do not need to order those values, but just need to check if a hash exists. So it should be fine
+	var imageId int64
 	err = tx.QueryRow(`INSERT INTO image(key, unlocked, image_provider_id, hash, width, height, sys_period) 
                         SELECT $1, $2, p.id, $3, $5, $6, '["now()",]'::tstzrange FROM image_provider p WHERE p.name = $4 
-                        RETURNING id`, 
-					  imageInfo.Name, autoUnlock, int64(imageInfo.Hash), imageProvider, imageInfo.Width, imageInfo.Height).Scan(&imageId)
+                        RETURNING id`,
+		imageInfo.Name, autoUnlock, int64(imageInfo.Hash), imageProvider, imageInfo.Width, imageInfo.Height).Scan(&imageId)
 	if err != nil {
 		log.Debug("[Adding donated photo] Couldn't insert image: ", err.Error())
 		raven.CaptureError(err, nil)
 		tx.Rollback()
-		return ImageDonationInternalError
+		return err
 	}
 
-    var insertedValidationIds []int64
-    if labels[0].Label != "" { //only create a image validation entry, if a label is provided
+	var insertedValidationIds []int64
+	if labels[0].Label != "" { //only create a image validation entry, if a label is provided
 
-        //per default we start with 0 validations, except if we are importing an image from a trusted
-        //source. in that case, already set "numOfValid" to 1.
-        numOfValid := 0
-        if imageInfo.Source.Trusted {
-            numOfValid = 1
-        }
+		//per default we start with 0 validations, except if we are importing an image from a trusted
+		//source. in that case, already set "numOfValid" to 1.
+		numOfValid := 0
+		if imageInfo.Source.Trusted {
+			numOfValid = 1
+		}
 
+		insertedValidationIds, err = _addLabelsAndLabelSuggestionsToImageInTransaction(tx, apiUser, labelMap, metalabels, imageInfo.Name, labels, numOfValid, 0)
+		if err != nil {
+			return err //tx already rolled back in case of error, so we can just return here
+		}
+	}
 
-        insertedValidationIds, err = _addLabelsAndLabelSuggestionsToImageInTransaction(tx, apiUser, labelMap, metalabels, imageInfo.Name, labels, numOfValid, 0)
-        if err != nil {
-            return ImageDonationInternalError //tx already rolled back in case of error, so we can just return here
-        }
-    }
+	if imageProvider != "donation" {
+		imageSourceId, err := _addImageSource(imageId, imageInfo.Source, tx)
+		if err != nil {
+			return err //tx already rolled back in case of error, so we can just return here
+		}
 
+		err = _addImageValidationSources(imageSourceId, insertedValidationIds, tx)
+		if err != nil {
+			return err //tx already rolled back in case of error, so we can just return here
+		}
+	}
 
-    if imageProvider != "donation" {
-        imageSourceId, err := _addImageSource(imageId, imageInfo.Source, tx)
-        if err != nil {
-            return ImageDonationInternalError //tx already rolled back in case of error, so we can just return here
-        }
+	//in case a username is provided, link image to user account
+	if apiUser.Name != "" {
+		_, err := tx.Exec(`INSERT INTO user_image(image_id, account_id)
+                            SELECT $1, id FROM account WHERE name = $2`, imageId, apiUser.Name)
+		if err != nil {
+			tx.Rollback()
+			log.Debug("[Add user image entry] Couldn't add entry: ", err.Error())
+			raven.CaptureError(err, nil)
+			return err
+		}
+	}
 
-        err = _addImageValidationSources(imageSourceId, insertedValidationIds, tx)
-        if err != nil {
-            return ImageDonationInternalError //tx already rolled back in case of error, so we can just return here
-        }
-    }
+	//if user is logged in
+	if apiUser.Name != "" {
+		//add image to default image collection
+		err = p._addImageToImageCollectionInTransaction(tx, apiUser.Name, MyDonations, imageInfo.Name, true)
+		if err != nil {
+			//transaction already rolled back
+			log.Error("[Add donated Image To Collection] Couldn't add image to default collection: ", err.Error())
+			raven.CaptureError(err, nil)
+			return err
+		}
+
+		//if image collection is provided
+		if imageCollectionName != "" {
+			err = p._addImageToImageCollectionInTransaction(tx, apiUser.Name, imageCollectionName, imageInfo.Name, true)
+			if err != nil {
+				//transaction already rolled back
+				log.Error("[Add donated Image To Collection] Couldn't add image to collection: ", err.Error())
+				raven.CaptureError(err, nil)
+				return err
+			}
+		}
+	}
 
-    //in case a username is provided, link image to user account
-    if apiUser.Name != "" {
-        _, err := tx.Exec(`INSERT INTO user_image(image_id, account_id)
-                            SELECT $1, id FROM account WHERE name = $2`, imageId, apiUser.Name)
-        if err != nil {
-            tx.Rollback()
-            log.Debug("[Add user image entry] Couldn't add entry: ", err.Error())
-            raven.CaptureError(err, nil)
-            return ImageDonationInternalError
-        }
-    }
-
-    if imageCollectionName != "" && apiUser.Name != "" {
-        _, err := tx.Exec(`INSERT INTO image_collection_image(user_image_collection_id, image_id)
-                           SELECT (SELECT u.id 
-                                 FROM user_image_collection u 
-                                 JOIN account a ON u.account_id = a.id
-                                 WHERE u.name = $1 AND a.name = $2), $3`,
-                           imageCollectionName, apiUser.Name, imageId)
-        if err != nil {
-            if err, ok := err.(*pq.Error); ok {
-                log.Info(err.Code)
-                if err.Code == "23502" {
-                    return ImageDonationImageCollectionDoesntExistError
-                }
-            }
-            tx.Rollback()
-            log.Error("[Add donated Image To Collection] Couldn't add image to collection: ", err.Error())
-            raven.CaptureError(err, nil)
-            return ImageDonationInternalError
-        }
-    }
-
-    if imageInfo.Source.Provider == "imagehunt" {
-        if len(insertedValidationIds) != 1 {
-            tx.Rollback()
-            err = errors.New("Couldn't create imagehunt entry due to missing or invalid label")
-            log.Error("[Create ImageHunt entry for donated image]", err.Error())
-            raven.CaptureError(err, nil)
-            return ImageDonationInternalError 
-        }
-
-        _, err := tx.Exec(`INSERT INTO imagehunt_task(image_validation_id, created)
+	if imageInfo.Source.Provider == "imagehunt" {
+		if len(insertedValidationIds) != 1 {
+			tx.Rollback()
+			err = errors.New("Couldn't create imagehunt entry due to missing or invalid label")
+			log.Error("[Create ImageHunt entry for donated image]", err.Error())
+			raven.CaptureError(err, nil)
+			return err
+		}
+
+		_, err := tx.Exec(`INSERT INTO imagehunt_task(image_validation_id, created)
                             VALUES($1, $2)`, insertedValidationIds[0], time.Now().Unix())
-        if err != nil {
-            tx.Rollback()
-            log.Error("[Create ImageHunt entry for donated image] Couldn't create entry: ", err.Error())
-            raven.CaptureError(err, nil)
-            return ImageDonationInternalError
-        }
-    }
-
-    err = tx.Commit()
-    if err != nil {
-        log.Error("[Add donated Image] Couldn't commit transaction: ", err.Error())
-        raven.CaptureError(err, nil)
-        return ImageDonationInternalError
-    }
-
-    return ImageDonationSuccess
-}
+		if err != nil {
+			tx.Rollback()
+			log.Error("[Create ImageHunt entry for donated image] Couldn't create entry: ", err.Error())
+			raven.CaptureError(err, nil)
+			return err
+		}
+	}
 
+	err = tx.Commit()
+	if err != nil {
+		log.Error("[Add donated Image] Couldn't commit transaction: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
+	}
+
+	return nil
+}
 
 func (p *ImageMonkeyDatabase) IsOwnDonation(imageId string, username string) (bool, error) {
-    isOwnDonation := false
-    rows, err := p.db.Query(`SELECT count(*)
+	isOwnDonation := false
+	rows, err := p.db.Query(`SELECT count(*)
                             FROM image i 
                             WHERE i.key = $1 AND EXISTS 
                                                         (
@@ -373,35 +370,35 @@ func (p *ImageMonkeyDatabase) IsOwnDonation(imageId string, username string) (bo
                                                             FROM image_quarantine q 
                                                             WHERE q.image_id = i.id 
                                                         )`, imageId, username)
-    if err != nil {
-        log.Debug("[Is Own Donation] Couldn't retrieve information: ", err.Error())
-        raven.CaptureError(err, nil)
-        return isOwnDonation, err
-    }
-
-    defer rows.Close()
-
-    for rows.Next() {
-        var num int32
-        err = rows.Scan(&num)
-        if err != nil {
-            log.Debug("[Is Own Donation] Couldn't scan row: ", err.Error())
-            raven.CaptureError(err, nil)
-            return isOwnDonation, err
-        }
-
-        if num > 0 {
-            isOwnDonation = true
-        }
-    }
-
-    return isOwnDonation, nil
+	if err != nil {
+		log.Debug("[Is Own Donation] Couldn't retrieve information: ", err.Error())
+		raven.CaptureError(err, nil)
+		return isOwnDonation, err
+	}
+
+	defer rows.Close()
+
+	for rows.Next() {
+		var num int32
+		err = rows.Scan(&num)
+		if err != nil {
+			log.Debug("[Is Own Donation] Couldn't scan row: ", err.Error())
+			raven.CaptureError(err, nil)
+			return isOwnDonation, err
+		}
+
+		if num > 0 {
+			isOwnDonation = true
+		}
+	}
+
+	return isOwnDonation, nil
 }
 
-func (p *ImageMonkeyDatabase) ReportImage(imageId string, reason string) error{
+func (p *ImageMonkeyDatabase) ReportImage(imageId string, reason string) error {
 	insertedId := 0
-	err := p.db.QueryRow("INSERT INTO image_report(image_id, reason) SELECT i.id, $2 FROM image i WHERE i.key = $1 RETURNING id", 
-					  imageId, reason).Scan(&insertedId)
+	err := p.db.QueryRow("INSERT INTO image_report(image_id, reason) SELECT i.id, $2 FROM image i WHERE i.key = $1 RETURNING id",
+		imageId, reason).Scan(&insertedId)
 	if err != nil {
 		log.Debug("[Report image] Couldn't add report: ", err.Error())
 		raven.CaptureError(err, nil)
@@ -411,28 +408,28 @@ func (p *ImageMonkeyDatabase) ReportImage(imageId string, reason string) error{
 	return nil
 }
 
-func (p *ImageMonkeyDatabase) GetAllUnverifiedImages(imageProvider string, shuffle bool, limit int) (datastructures.LockedImages, error){
-    var lockedImages datastructures.LockedImages
-    var queryValues []interface{}
+func (p *ImageMonkeyDatabase) GetAllUnverifiedImages(imageProvider string, shuffle bool, limit int) (datastructures.LockedImages, error) {
+	var lockedImages datastructures.LockedImages
+	var queryValues []interface{}
 
-    orderRandomly := ""
-    if shuffle {
-        orderRandomly = "ORDER BY RANDOM()"
-    }
+	orderRandomly := ""
+	if shuffle {
+		orderRandomly = "ORDER BY RANDOM()"
+	}
 
-    limitBy := ""
-    if limit != -1 {
-        limitBy = fmt.Sprintf("LIMIT $%d", len(queryValues) + 1)
-        queryValues = append(queryValues, limit)
-    }
+	limitBy := ""
+	if limit != -1 {
+		limitBy = fmt.Sprintf("LIMIT $%d", len(queryValues)+1)
+		queryValues = append(queryValues, limit)
+	}
 
-    q1 := "WHERE q.image_id NOT IN (SELECT image_id FROM image_quarantine)"
-    if imageProvider != "" {
-        q1 = fmt.Sprintf("WHERE (p.name = $%d) AND q.image_id NOT IN (SELECT image_id FROM image_quarantine)", len(queryValues) + 1)
-        queryValues = append(queryValues, imageProvider)
-    }
+	q1 := "WHERE q.image_id NOT IN (SELECT image_id FROM image_quarantine)"
+	if imageProvider != "" {
+		q1 = fmt.Sprintf("WHERE (p.name = $%d) AND q.image_id NOT IN (SELECT image_id FROM image_quarantine)", len(queryValues)+1)
+		queryValues = append(queryValues, imageProvider)
+	}
 
-    q := fmt.Sprintf(`SELECT q.image_key, q.image_width, q.image_height, COALESCE(string_agg(q.label_name::text, ','), '') as labels, 
+	q := fmt.Sprintf(`SELECT q.image_key, q.image_width, q.image_height, COALESCE(string_agg(q.label_name::text, ','), '') as labels, 
                       p.name as image_provider
                       FROM 
                       (
@@ -458,8 +455,7 @@ func (p *ImageMonkeyDatabase) GetAllUnverifiedImages(imageProvider string, shuff
                     %s
                     %s`, q1, orderRandomly, limitBy)
 
-
-    totalImagesQuery := fmt.Sprintf(`SELECT count(*) 
+	totalImagesQuery := fmt.Sprintf(`SELECT count(*) 
                                      FROM 
                                      ( SELECT i.id as image_id, i.image_provider_id as image_provider_id,
                                        i.unlocked as unlocked
@@ -468,155 +464,148 @@ func (p *ImageMonkeyDatabase) GetAllUnverifiedImages(imageProvider string, shuff
                                      JOIN image_provider p ON p.id = q.image_provider_id 
                                      %s AND q.unlocked = false`, q1)
 
-    var err error
-    var rows *sql.Rows
-    
-    tx, err := p.db.Begin()
-    if err != nil {
-        log.Debug("[Fetch unverified images] Couldn't begin transaction: ", err.Error())
-        raven.CaptureError(err, nil)
-        return lockedImages, err
-    }
-
-    rows, err = tx.Query(q, queryValues...)
-
-    if err != nil {
-        log.Debug("[Fetch unverified images] Couldn't fetch unverified images: ", err.Error())
-        raven.CaptureError(err, nil)
-        return lockedImages, err
-    }
-
-    defer rows.Close()
-
-    for rows.Next() {
-        var image datastructures.LockedImage
-        err = rows.Scan(&image.Id, &image.Width, &image.Height, &image.Labels, &image.Provider)
-        if err != nil {
-            log.Debug("[Fetch unverified images] Couldn't scan row: ", err.Error())
-            raven.CaptureError(err, nil)
-            return lockedImages, err
-        }
-
-        lockedImages.Images = append(lockedImages.Images, image)
-    }
-
-
-    err = tx.QueryRow(totalImagesQuery).Scan(&lockedImages.Total)
-    if err != nil {
-        log.Debug("[Fetch unverified images] Couldn't get number of images: ", err.Error())
-        raven.CaptureError(err, nil)
-        return lockedImages, err
-    }
-
-    err = tx.Commit()
-    if err != nil {
-        log.Debug("[Fetch unverified images] Couldn't commit transaction: ", err.Error())
-        raven.CaptureError(err, nil)
-        return lockedImages, err
-    }
-
-    return lockedImages, nil
+	var err error
+	var rows *sql.Rows
+
+	tx, err := p.db.Begin()
+	if err != nil {
+		log.Debug("[Fetch unverified images] Couldn't begin transaction: ", err.Error())
+		raven.CaptureError(err, nil)
+		return lockedImages, err
+	}
+
+	rows, err = tx.Query(q, queryValues...)
+
+	if err != nil {
+		log.Debug("[Fetch unverified images] Couldn't fetch unverified images: ", err.Error())
+		raven.CaptureError(err, nil)
+		return lockedImages, err
+	}
+
+	defer rows.Close()
+
+	for rows.Next() {
+		var image datastructures.LockedImage
+		err = rows.Scan(&image.Id, &image.Width, &image.Height, &image.Labels, &image.Provider)
+		if err != nil {
+			log.Debug("[Fetch unverified images] Couldn't scan row: ", err.Error())
+			raven.CaptureError(err, nil)
+			return lockedImages, err
+		}
+
+		lockedImages.Images = append(lockedImages.Images, image)
+	}
+
+	err = tx.QueryRow(totalImagesQuery).Scan(&lockedImages.Total)
+	if err != nil {
+		log.Debug("[Fetch unverified images] Couldn't get number of images: ", err.Error())
+		raven.CaptureError(err, nil)
+		return lockedImages, err
+	}
+
+	err = tx.Commit()
+	if err != nil {
+		log.Debug("[Fetch unverified images] Couldn't commit transaction: ", err.Error())
+		raven.CaptureError(err, nil)
+		return lockedImages, err
+	}
+
+	return lockedImages, nil
 }
 
 func (p *ImageMonkeyDatabase) DeleteImage(uuid string) error {
-    var imageId int64
-
-    tx, err := p.db.Begin()
-    if err != nil {
-        log.Debug("[Delete image] Couldn't begin transaction: ", err.Error())
-        raven.CaptureError(err, nil)
-        return err
-    }
+	var imageId int64
 
+	tx, err := p.db.Begin()
+	if err != nil {
+		log.Debug("[Delete image] Couldn't begin transaction: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
+	}
 
-    _, err = tx.Exec(`DELETE FROM user_image
+	_, err = tx.Exec(`DELETE FROM user_image
                       WHERE image_id IN (
                         SELECT id FROM image WHERE key = $1 
                       )`, uuid)
-    if err != nil {
-        tx.Rollback()
-        log.Debug("[Delete image] Couldn't delete user_image entry: ", err.Error())
-        raven.CaptureError(err, nil)
-        return err
-    }
-
+	if err != nil {
+		tx.Rollback()
+		log.Debug("[Delete image] Couldn't delete user_image entry: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
+	}
 
-    _, err = tx.Exec(`DELETE FROM image_validation
+	_, err = tx.Exec(`DELETE FROM image_validation
                       WHERE image_id IN (
                         SELECT id FROM image WHERE key = $1 
                       )`, uuid)
-    if err != nil {
-        tx.Rollback()
-        log.Debug("[Delete image] Couldn't delete image_validation entry: ", err.Error())
-        raven.CaptureError(err, nil)
-        return err
-    }
-
+	if err != nil {
+		tx.Rollback()
+		log.Debug("[Delete image] Couldn't delete image_validation entry: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
+	}
 
-    imageId = -1
-    err = tx.QueryRow(`DELETE FROM image i WHERE key = $1
+	imageId = -1
+	err = tx.QueryRow(`DELETE FROM image i WHERE key = $1
                        RETURNING i.id`, uuid).Scan(&imageId)
-    if err != nil {
-        tx.Rollback()
-        log.Debug("[Delete image] Couldn't delete image entry: ", err.Error())
-        raven.CaptureError(err, nil)
-        return err
-    }
-
-    if imageId == -1 {
-        tx.Rollback()
-        err = errors.New("nothing deleted")
-        log.Debug("[Delete image] Couldn't delete image entry: ", err.Error())
-        raven.CaptureError(err, nil)
-        return err
-    }
-
-    _, err = tx.Exec(`DELETE FROM image_label_suggestion s 
+	if err != nil {
+		tx.Rollback()
+		log.Debug("[Delete image] Couldn't delete image entry: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
+	}
+
+	if imageId == -1 {
+		tx.Rollback()
+		err = errors.New("nothing deleted")
+		log.Debug("[Delete image] Couldn't delete image entry: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
+	}
+
+	_, err = tx.Exec(`DELETE FROM image_label_suggestion s 
                        WHERE image_id = $1`, imageId)
 
-    if err != nil {
-        tx.Rollback()
-        log.Debug("[Delete image] Couldn't delete image_label_suggestion entry: ", err.Error())
-        raven.CaptureError(err, nil)
-        return err
-    }
-    
-
-    err = tx.Commit()
-    if err != nil {
-        log.Debug("[Delete image] Couldn't commit transaction: ", err.Error())
-        raven.CaptureError(err, nil)
-        return err
-    }
-
-    return nil
+	if err != nil {
+		tx.Rollback()
+		log.Debug("[Delete image] Couldn't delete image_label_suggestion entry: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
+	}
+
+	err = tx.Commit()
+	if err != nil {
+		log.Debug("[Delete image] Couldn't commit transaction: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
+	}
+
+	return nil
 }
 
-func (p *ImageMonkeyDatabase) Export(parseResult parser.ParseResult, annotationsOnly bool) ([]datastructures.ExportedImage, error){
-    joinType := "FULL OUTER JOIN"
-    if annotationsOnly {
-        joinType = "JOIN"
-    }
-
-    
-    q1 := ""
-    q2 := ""
-    q3 := ""
-    identifier := ""
-    if parseResult.IsUuidQuery {
-        q1 = "JOIN label l ON l.id = r.label_id"
-        q2 = "JOIN label l ON l.id = n.label_id"
-        q3 = "JOIN label l ON l.id = v.label_id"
-        identifier = "l.name"
-    } else {
-        q1 = "JOIN label_accessor a ON r.label_id = a.label_id"
-        q2 = "JOIN label_accessor a ON n.label_id = a.label_id"
-        q3 = "JOIN label_accessor a ON a.label_id = v.label_id"
-        identifier = "a.accessor"
-    }
-
-
-    q := fmt.Sprintf(`SELECT i.key, CASE WHEN json_agg(q3.annotations)::jsonb = '[null]'::jsonb THEN '[]' ELSE json_agg(q3.annotations)::jsonb END as annotations, 
+func (p *ImageMonkeyDatabase) Export(parseResult parser.ParseResult, annotationsOnly bool) ([]datastructures.ExportedImage, error) {
+	joinType := "FULL OUTER JOIN"
+	if annotationsOnly {
+		joinType = "JOIN"
+	}
+
+	q1 := ""
+	q2 := ""
+	q3 := ""
+	identifier := ""
+	if parseResult.IsUuidQuery {
+		q1 = "JOIN label l ON l.id = r.label_id"
+		q2 = "JOIN label l ON l.id = n.label_id"
+		q3 = "JOIN label l ON l.id = v.label_id"
+		identifier = "l.name"
+	} else {
+		q1 = "JOIN label_accessor a ON r.label_id = a.label_id"
+		q2 = "JOIN label_accessor a ON n.label_id = a.label_id"
+		q3 = "JOIN label_accessor a ON a.label_id = v.label_id"
+		identifier = "a.accessor"
+	}
+
+	q := fmt.Sprintf(`SELECT i.key, CASE WHEN json_agg(q3.annotations)::jsonb = '[null]'::jsonb THEN '[]' ELSE json_agg(q3.annotations)::jsonb END as annotations, 
                       q3.validations, i.width, i.height
                       FROM image i 
                       JOIN
@@ -656,47 +645,47 @@ func (p *ImageMonkeyDatabase) Export(parseResult parser.ParseResult, annotations
                       
                      WHERE i.unlocked = true
                      GROUP BY i.key, q3.validations, i.width, i.height`, identifier, q1, parseResult.Query, identifier, q2, parseResult.Query, joinType, identifier, q3, parseResult.Query)
-    rows, err := p.db.Query(q, parseResult.QueryValues...)
-    if err != nil {
-        log.Debug("[Export] Couldn't export data: ", err.Error())
-        raven.CaptureError(err, nil)
-        return nil, err
-    }
-    defer rows.Close()
-
-    imageEntries := []datastructures.ExportedImage{}
-    for rows.Next() {
-        var image datastructures.ExportedImage
-        var annotations []byte
-        var validations []byte
-        image.Provider = "donation"
-
-        err = rows.Scan(&image.Id, &annotations, &validations, &image.Width, &image.Height)
-        if err != nil {
-            log.Debug("[Export] Couldn't scan row: ", err.Error())
-            raven.CaptureError(err, nil)
-            return nil, err
-        }
-
-        if len(annotations) > 0 {
-            err := json.Unmarshal(annotations, &image.Annotations)
-            if err != nil {
-                log.Debug("[Export] Couldn't unmarshal annotations: ", err.Error())
-                raven.CaptureError(err, nil)
-                return nil, err
-            }
-        }
-
-        if len(validations) > 0 {
-            err := json.Unmarshal(validations, &image.Validations)
-            if err != nil {
-                log.Debug("[Export] Couldn't unmarshal validations: ", err.Error())
-                raven.CaptureError(err, nil)
-                return nil, err
-            }
-        }
-
-        imageEntries = append(imageEntries, image)
-    }
-    return imageEntries, err
+	rows, err := p.db.Query(q, parseResult.QueryValues...)
+	if err != nil {
+		log.Debug("[Export] Couldn't export data: ", err.Error())
+		raven.CaptureError(err, nil)
+		return nil, err
+	}
+	defer rows.Close()
+
+	imageEntries := []datastructures.ExportedImage{}
+	for rows.Next() {
+		var image datastructures.ExportedImage
+		var annotations []byte
+		var validations []byte
+		image.Provider = "donation"
+
+		err = rows.Scan(&image.Id, &annotations, &validations, &image.Width, &image.Height)
+		if err != nil {
+			log.Debug("[Export] Couldn't scan row: ", err.Error())
+			raven.CaptureError(err, nil)
+			return nil, err
+		}
+
+		if len(annotations) > 0 {
+			err := json.Unmarshal(annotations, &image.Annotations)
+			if err != nil {
+				log.Debug("[Export] Couldn't unmarshal annotations: ", err.Error())
+				raven.CaptureError(err, nil)
+				return nil, err
+			}
+		}
+
+		if len(validations) > 0 {
+			err := json.Unmarshal(validations, &image.Validations)
+			if err != nil {
+				log.Debug("[Export] Couldn't unmarshal validations: ", err.Error())
+				raven.CaptureError(err, nil)
+				return nil, err
+			}
+		}
+
+		imageEntries = append(imageEntries, image)
+	}
+	return imageEntries, err
 }
diff --git a/src/database/image_annotation.go b/src/database/image_annotation.go
index d9e5723e..d1cbb54c 100644
--- a/src/database/image_annotation.go
+++ b/src/database/image_annotation.go
@@ -1882,6 +1882,7 @@ func (p *ImageMonkeyDatabase) GetAvailableAnnotationTasks(apiUser datastructures
                               ) q WHERE %s
                         )qq
                       ) qqq
+                      GROUP BY image_key, image_width, image_height, validation_uuid, image_unlocked, accessor
                       %s`, parseResult.Subquery, parseResult.Subquery, parseResult.Subquery, 
 					  		q2, q4, q3, includeOwnImageDonations, parseResult.Query, orderBy)
 
diff --git a/src/database/image_collection.go b/src/database/image_collection.go
index a49c13ae..fb2bcc15 100644
--- a/src/database/image_collection.go
+++ b/src/database/image_collection.go
@@ -1,29 +1,14 @@
 package imagemonkeydb
 
 import (
-    "github.com/getsentry/raven-go"
-    log "github.com/sirupsen/logrus"
-    datastructures "github.com/bbernhard/imagemonkey-core/datastructures"
+	"database/sql"
 	commons "github.com/bbernhard/imagemonkey-core/commons"
+	datastructures "github.com/bbernhard/imagemonkey-core/datastructures"
+	"github.com/getsentry/raven-go"
 	"github.com/lib/pq"
-)
-
-type AddImageCollectionErrorType int
-
-const (
-  AddImageCollectionSuccess AddImageCollectionErrorType = 1 << iota
-  AddImageCollectionInternalError
-  AddImageCollectionAlreadyExistsError
-)
-
-
-type AddImageToImageCollectionErrorType int
-
-const (
-  AddImageToImageCollectionSuccess AddImageToImageCollectionErrorType = 1 << iota
-  AddImageToImageCollectionInternalError
-  AddImageToImageCollectionInvalidInputError
-  AddImageToImageCollectionDuplicateEntryError
+	log "github.com/sirupsen/logrus"
+	"fmt"
+	"time"
 )
 
 func (p *ImageMonkeyDatabase) GetImageCollections(apiUser datastructures.APIUser, apiBaseUrl string) ([]datastructures.ImageCollection, error) {
@@ -52,79 +37,142 @@ func (p *ImageMonkeyDatabase) GetImageCollections(apiUser datastructures.APIUser
 								JOIN image i ON q1.image_id = i.id
 							 ) q1 ON q1.user_image_collection_id = u.id 
 							 WHERE a.name = $1`, apiUser.Name)
-    if err != nil {
-        log.Error("[Image Collections] Couldn't get image collections: ", err.Error())
-        raven.CaptureError(err, nil)
-        return imageCollections, err
-    }
-
-    defer rows.Close()
-
-    for rows.Next() {
-    	var imageCollection datastructures.ImageCollection
-    	err = rows.Scan(&imageCollection.Name, &imageCollection.Description, &imageCollection.Count, 
-    					&imageCollection.SampleImage.Id, &imageCollection.SampleImage.Width, &imageCollection.SampleImage.Height,
-    					&imageCollection.SampleImage.Unlocked)
-    	if err != nil {
-    		log.Error("[Image Collections] Couldn't scan image collection: ", err.Error())
-        	raven.CaptureError(err, nil)
-        	return imageCollections, err
-    	}
-
-    	if imageCollection.SampleImage.Id == "" {
-	    	imageCollection.SampleImage.Id = ""
-	    	imageCollection.SampleImage.Unlocked = true
-	    	imageCollection.SampleImage.Width = 960
-	    	imageCollection.SampleImage.Height = 796
-	    	imageCollection.SampleImage.Url = "/img/default.png"
-	    } else {
-	    	imageCollection.SampleImage.Url = commons.GetImageUrlFromImageId(apiBaseUrl, imageCollection.SampleImage.Id, imageCollection.SampleImage.Unlocked)
-	    }
-
-    	imageCollections = append(imageCollections, imageCollection)
-    }
-
-    return imageCollections, nil
+	if err != nil {
+		log.Error("[Image Collections] Couldn't get image collections: ", err.Error())
+		raven.CaptureError(err, nil)
+		return imageCollections, err
+	}
+
+	defer rows.Close()
+
+	for rows.Next() {
+		var imageCollection datastructures.ImageCollection
+		err = rows.Scan(&imageCollection.Name, &imageCollection.Description, &imageCollection.Count,
+			&imageCollection.SampleImage.Id, &imageCollection.SampleImage.Width, &imageCollection.SampleImage.Height,
+			&imageCollection.SampleImage.Unlocked)
+		if err != nil {
+			log.Error("[Image Collections] Couldn't scan image collection: ", err.Error())
+			raven.CaptureError(err, nil)
+			return imageCollections, err
+		}
+
+		if imageCollection.SampleImage.Id == "" {
+			imageCollection.SampleImage.Id = ""
+			imageCollection.SampleImage.Unlocked = true
+			imageCollection.SampleImage.Width = 960
+			imageCollection.SampleImage.Height = 796
+			imageCollection.SampleImage.Url = "/img/default.png"
+		} else {
+			imageCollection.SampleImage.Url = commons.GetImageUrlFromImageId(apiBaseUrl, imageCollection.SampleImage.Id, imageCollection.SampleImage.Unlocked)
+		}
+
+		imageCollections = append(imageCollections, imageCollection)
+	}
+
+	return imageCollections, nil
 }
 
-func (p *ImageMonkeyDatabase) AddImageCollection(apiUser datastructures.APIUser, name string, description string) AddImageCollectionErrorType {
-	_, err := p.db.Exec(`INSERT INTO user_image_collection(account_id, name, description)
-							SELECT id, $2, $3 FROM account WHERE name = $1`, apiUser.Name, name, description)
+func (p *ImageMonkeyDatabase) _addImageCollectionInTransaction(tx *sql.Tx, username string, name string, description string) error {
+	_, err := tx.Exec(`INSERT INTO user_image_collection(account_id, name, description)
+							SELECT id, $2, $3 FROM account WHERE name = $1`, username, name, description)
 	if err != nil {
 		if err, ok := err.(*pq.Error); ok {
 			if err.Code == "23505" {
-				return AddImageCollectionAlreadyExistsError
+				tx.Rollback()
+				return &DuplicateImageCollectionError{Description: "An Image Collection with that name already exists"}
 			}
 		}
+		tx.Rollback()
+		return err
+	}
+
+	return nil
+}
+
+func (p *ImageMonkeyDatabase) AddImageCollection(apiUser datastructures.APIUser, name string, description string) error {
+	tx, err := p.db.Begin()
+	if err != nil {
+		log.Error("[Image Collections] Couldn't begin transaction: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
+	}
+
+	err = p._addImageCollectionInTransaction(tx, apiUser.Name, name, description)
+	if err != nil { //transaction already rolled back
 		log.Error("[Image Collections] Couldn't add image collection: ", err.Error())
-        raven.CaptureError(err, nil)
-        return AddImageCollectionInternalError
+		raven.CaptureError(err, nil)
+		return err
+	}
+
+	err = tx.Commit()
+	if err != nil {
+		log.Error("[Image Collections] Couldn't commit transaction: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
 	}
 
-	return AddImageCollectionSuccess
+	return nil
 }
 
-func (p *ImageMonkeyDatabase) AddImageToImageCollection(apiUser datastructures.APIUser, 
-	imageCollectionName string, imageId string) AddImageToImageCollectionErrorType {
+func (p *ImageMonkeyDatabase) _addImageToImageCollectionInTransaction(tx *sql.Tx, username string,
+	imageCollectionName string, imageId string, failIfAlreadyAssigned bool) error {
 
-	_, err := p.db.Exec(`INSERT INTO image_collection_image(user_image_collection_id, image_id)
+	currentUnixTimestamp := int64(time.Now().Unix())
+
+	queryValues := []interface{}{imageCollectionName, username, imageId, currentUnixTimestamp}
+
+	q1 := ""
+	if !failIfAlreadyAssigned {
+		q1 = "ON CONFLICT(user_image_collection_id, image_id) DO UPDATE SET last_modified = $4"
+	}
+
+	q := fmt.Sprintf(`INSERT INTO image_collection_image(user_image_collection_id, image_id, last_modified)
 						 SELECT (SELECT u.id 
 						   		 FROM user_image_collection u 
 						   		 JOIN account a ON u.account_id = a.id
-						   		 WHERE u.name = $1 AND a.name = $2), (SELECT id FROM image WHERE key = $3)`, 
-						   		 imageCollectionName, apiUser.Name, imageId)
+						   		 WHERE u.name = $1 AND a.name = $2), (SELECT id FROM image WHERE key = $3), $4
+					  %s`, q1)
+	_, err := tx.Exec(q, queryValues...)
 	if err != nil {
 		if err, ok := err.(*pq.Error); ok {
 			if err.Code == "23502" {
-				return AddImageToImageCollectionInvalidInputError
+				tx.Rollback()
+				return &InvalidImageCollectionInputError{Description: "Invalid Image Collection Input"}
 			} else if err.Code == "23505" {
-				return AddImageToImageCollectionDuplicateEntryError	
+				tx.Rollback()
+				return &DuplicateImageCollectionError{Description: "Image already assigned to Image Collection"}
 			}
 		}
-		log.Error("[Add Image To Collection] Couldn't add image to collection: ", err.Error())
-        raven.CaptureError(err, nil)
-        return AddImageToImageCollectionInternalError
+		tx.Rollback()
+		return err
+	}
+
+	return nil
+}
+
+func (p *ImageMonkeyDatabase) AddImageToImageCollection(apiUser datastructures.APIUser,
+	imageCollectionName string, imageId string, failIfAlreadyAssigned bool) error {
+
+	tx, err := p.db.Begin()
+	if err != nil {
+		log.Error("[Add Image To Collection] Couldn't begin transaction: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
+	}
+
+	err = p._addImageToImageCollectionInTransaction(tx, apiUser.Name, imageCollectionName, imageId, failIfAlreadyAssigned)
+	if err != nil { //transaction already rolled back
+		log.Error("[Add Image to Collection] Couldn't add image to image collection: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
+	}
+
+	err = tx.Commit()
+	if err != nil {
+		log.Error("[Add Image to Collection] Couldn't commit transaction: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
 	}
 
-	return AddImageToImageCollectionSuccess
+	return nil
 }
diff --git a/src/database/image_label.go b/src/database/image_label.go
index 5c5ea7c7..b1176557 100644
--- a/src/database/image_label.go
+++ b/src/database/image_label.go
@@ -272,21 +272,30 @@ func (p *ImageMonkeyDatabase) AddLabelsToImage(apiUser datastructures.APIUser, l
 	metalabels *commons.MetaLabels, imageId string, labels []datastructures.LabelMeEntry) error {
 	tx, err := p.db.Begin()
 	if err != nil {
-		log.Debug("[Adding image labels] Couldn't begin transaction: ", err.Error())
+		log.Error("[Adding image labels] Couldn't begin transaction: ", err.Error())
 		raven.CaptureError(err, nil)
 		return err
 	}
 
 	_, err = _addLabelsAndLabelSuggestionsToImageInTransaction(tx, apiUser, labelMap, metalabels, imageId, labels, 0, 0)
 	if err != nil { //tx already rolled back in case of error, so we can just return here
-		log.Debug("[Adding image labels] Couldn't add labels: ", err.Error())
+		log.Error("[Adding image labels] Couldn't add labels: ", err.Error())
 		raven.CaptureError(err, nil)
 		return err
 	}
 
+	if apiUser.Name != "" {
+		err = p._addImageToImageCollectionInTransaction(tx, apiUser.Name, MyOpenTasks, imageId, false)
+		if err != nil { //transaction already rolled back, so we can just return here
+			log.Error("[Adding image labels] Couldn't add image to default image collection: ", err.Error())
+			raven.CaptureError(err, nil)
+			return err
+		}
+	}
+
 	err = tx.Commit()
 	if err != nil {
-		log.Debug("[Adding image labels] Couldn't commit changes: ", err.Error())
+		log.Error("[Adding image labels] Couldn't commit changes: ", err.Error())
 		raven.CaptureError(err, nil)
 		return err
 	}
diff --git a/src/database/user.go b/src/database/user.go
index fae71b43..664fd4bc 100644
--- a/src/database/user.go
+++ b/src/database/user.go
@@ -1,34 +1,33 @@
 package imagemonkeydb
 
 import (
-    datastructures "github.com/bbernhard/imagemonkey-core/datastructures"
+	"errors"
+	datastructures "github.com/bbernhard/imagemonkey-core/datastructures"
 	"github.com/getsentry/raven-go"
-    log "github.com/sirupsen/logrus"
-    "time"
-    "errors"
+	log "github.com/sirupsen/logrus"
+	"time"
 )
 
 func (p *ImageMonkeyDatabase) GetUserInfo(username string) (datastructures.UserInfo, error) {
-    var userInfo datastructures.UserInfo
-    var removeLabelPermission bool
-    var unlockImageDescriptionPermission bool
-    var unlockImage bool
-    var canMonitorSystem bool
+	var userInfo datastructures.UserInfo
+	var removeLabelPermission bool
+	var unlockImageDescriptionPermission bool
+	var unlockImage bool
+	var canMonitorSystem bool
 	var canAcceptTrendingLabel bool
-    removeLabelPermission = false
-    unlockImageDescriptionPermission = false
-    unlockImage = false
-    canMonitorSystem = false
+	removeLabelPermission = false
+	unlockImageDescriptionPermission = false
+	unlockImage = false
+	canMonitorSystem = false
 	canAcceptTrendingLabel = false
 
+	userInfo.Name = ""
+	userInfo.Created = 0
+	userInfo.ProfilePicture = ""
+	userInfo.IsModerator = false
+	userInfo.Permissions = nil
 
-    userInfo.Name = ""
-    userInfo.Created = 0
-    userInfo.ProfilePicture = ""
-    userInfo.IsModerator = false
-    userInfo.Permissions = nil
-
-    rows, err := p.db.Query(`SELECT a.name, COALESCE(a.profile_picture, ''), a.created, a.is_moderator,
+	rows, err := p.db.Query(`SELECT a.name, COALESCE(a.profile_picture, ''), a.created, a.is_moderator,
                               COALESCE(p.can_remove_label, false) as remove_label_permission,
                               COALESCE(p.can_unlock_image_description, false) as unlock_image_description,
                               COALESCE(p.can_unlock_image, false) as unlock_image,
@@ -37,135 +36,170 @@ func (p *ImageMonkeyDatabase) GetUserInfo(username string) (datastructures.UserI
                               FROM account a 
                               LEFT JOIN account_permission p ON p.account_id = a.id 
                               WHERE a.name = $1`, username)
-    if err != nil {
-        log.Debug("[User Info] Couldn't get user info: ", err.Error())
-        raven.CaptureError(err, nil)
-        return userInfo, err
-    }
-
-    defer rows.Close()
-
-    if rows.Next() {
-        err = rows.Scan(&userInfo.Name, &userInfo.ProfilePicture, &userInfo.Created, 
-                        &userInfo.IsModerator, &removeLabelPermission, 
-                        &unlockImageDescriptionPermission, &unlockImage, &canMonitorSystem, &canAcceptTrendingLabel)
-
-        if err != nil {
-            log.Debug("[User Info] Couldn't scan user info: ", err.Error())
-            raven.CaptureError(err, nil)
-            return userInfo, err
-        }
-
-        if userInfo.IsModerator {
-            permissions := &datastructures.UserPermissions {CanRemoveLabel: removeLabelPermission, 
-                                                            CanUnlockImageDescription: unlockImageDescriptionPermission,
-                                                            CanUnlockImage: unlockImage,
-                                                            CanMonitorSystem: canMonitorSystem,
-															CanAcceptTrendingLabel: canAcceptTrendingLabel}
-            userInfo.Permissions = permissions
-        }
-    }
-
-    return userInfo, nil
+	if err != nil {
+		log.Error("[User Info] Couldn't get user info: ", err.Error())
+		raven.CaptureError(err, nil)
+		return userInfo, err
+	}
+
+	defer rows.Close()
+
+	if rows.Next() {
+		err = rows.Scan(&userInfo.Name, &userInfo.ProfilePicture, &userInfo.Created,
+			&userInfo.IsModerator, &removeLabelPermission,
+			&unlockImageDescriptionPermission, &unlockImage, &canMonitorSystem, &canAcceptTrendingLabel)
+
+		if err != nil {
+			log.Error("[User Info] Couldn't scan user info: ", err.Error())
+			raven.CaptureError(err, nil)
+			return userInfo, err
+		}
+
+		if userInfo.IsModerator {
+			permissions := &datastructures.UserPermissions{CanRemoveLabel: removeLabelPermission,
+				CanUnlockImageDescription: unlockImageDescriptionPermission,
+				CanUnlockImage:            unlockImage,
+				CanMonitorSystem:          canMonitorSystem,
+				CanAcceptTrendingLabel:    canAcceptTrendingLabel}
+			userInfo.Permissions = permissions
+		}
+	}
+
+	return userInfo, nil
 }
 
 func (p *ImageMonkeyDatabase) UserExists(username string) (bool, error) {
-    var numOfExistingUsers int32
-    err := p.db.QueryRow("SELECT count(*) FROM account u WHERE u.name = $1", username).Scan(&numOfExistingUsers)
-    if err != nil {
-        log.Debug("[User exists] Couldn't get num of existing users: ", err.Error())
-        raven.CaptureError(err, nil)
-        return false, err
-    }
-
-    if numOfExistingUsers > 0 {
-        return true, nil
-    }
-    return false, nil
+	var numOfExistingUsers int32
+	err := p.db.QueryRow("SELECT count(*) FROM account u WHERE u.name = $1", username).Scan(&numOfExistingUsers)
+	if err != nil {
+		log.Error("[User exists] Couldn't get num of existing users: ", err.Error())
+		raven.CaptureError(err, nil)
+		return false, err
+	}
+
+	if numOfExistingUsers > 0 {
+		return true, nil
+	}
+	return false, nil
 }
 
 func (p *ImageMonkeyDatabase) EmailExists(email string) (bool, error) {
-    var numOfExistingUsers int32
-    err := p.db.QueryRow("SELECT count(*) FROM account u WHERE u.email = $1", email).Scan(&numOfExistingUsers)
-    if err != nil {
-        log.Debug("[Email exists] Couldn't get num of existing users: ", err.Error())
-        raven.CaptureError(err, nil)
-        return false, err
-    }
-
-    if numOfExistingUsers > 0 {
-        return true, nil
-    }
-    return false, nil
+	var numOfExistingUsers int32
+	err := p.db.QueryRow("SELECT count(*) FROM account u WHERE u.email = $1", email).Scan(&numOfExistingUsers)
+	if err != nil {
+		log.Error("[Email exists] Couldn't get num of existing users: ", err.Error())
+		raven.CaptureError(err, nil)
+		return false, err
+	}
+
+	if numOfExistingUsers > 0 {
+		return true, nil
+	}
+	return false, nil
 }
 
 func (p *ImageMonkeyDatabase) GetHashedPasswordForUser(username string) (string, error) {
-    var hashedPassword string
-    err := p.db.QueryRow("SELECT hashed_password FROM account u WHERE u.name = $1", username).Scan(&hashedPassword)
-    if err != nil {
-        log.Debug("[Hashed Password] Couldn't get hashed password for user: ", err.Error())
-        raven.CaptureError(err, nil)
-        return "", err
-    }
-
-    return hashedPassword, nil
+	var hashedPassword string
+	err := p.db.QueryRow("SELECT hashed_password FROM account u WHERE u.name = $1", username).Scan(&hashedPassword)
+	if err != nil {
+		log.Error("[Hashed Password] Couldn't get hashed password for user: ", err.Error())
+		raven.CaptureError(err, nil)
+		return "", err
+	}
+
+	return hashedPassword, nil
 }
 
 func (p *ImageMonkeyDatabase) CreateUser(username string, hashedPassword []byte, email string) error {
-    var insertedId int64
-
-    created := int64(time.Now().Unix())
-
-    insertedId = 0
-    err := p.db.QueryRow(`INSERT INTO account(name, hashed_password, email, created, is_moderator) 
-                        VALUES($1, $2, $3, $4, $5) RETURNING id`, 
-                        username, hashedPassword, email, created, false).Scan(&insertedId)
-    if err != nil {
-        log.Debug("[Creating User] Couldn't create user: ", err.Error())
-        raven.CaptureError(err, nil)
-        return err
-    }
-
-    if insertedId == 0 {
-        return errors.New("nothing inserted")
-    }
-
-    return nil
+	var insertedId int64
+
+	type DefaultImageCollection struct {
+		Name        string
+		Description string
+	}
+
+	created := int64(time.Now().Unix())
+
+	defaultImageCollections := []DefaultImageCollection{
+		DefaultImageCollection{Name: MyDonations, Description: "My donations"},
+		DefaultImageCollection{Name: MyOpenTasks, Description: "My open tasks"},
+	}
+
+	tx, err := p.db.Begin()
+	if err != nil {
+		log.Error("[Creating User] Couldn't begin transaction: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
+	}
+
+	insertedId = 0
+	err = tx.QueryRow(`INSERT INTO account(name, hashed_password, email, created, is_moderator) 
+                        VALUES($1, $2, $3, $4, $5) RETURNING id`,
+		username, hashedPassword, email, created, false).Scan(&insertedId)
+	if err != nil {
+		tx.Rollback()
+		log.Error("[Creating User] Couldn't create user: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
+	}
+
+	if insertedId == 0 {
+		tx.Rollback()
+		return errors.New("nothing inserted")
+	}
+
+	for _, defaultImageCollection := range defaultImageCollections {
+		err = p._addImageCollectionInTransaction(tx, username, defaultImageCollection.Name, defaultImageCollection.Description)
+		if err != nil {
+			//transaction already rolled back
+			log.Error("[Creating User] Couldn't add default image collection: ", err.Error())
+			raven.CaptureError(err, nil)
+			return err
+		}
+	}
+
+	err = tx.Commit()
+	if err != nil {
+		log.Error("[Creating User] Couldn't commit transaction: ", err.Error())
+		raven.CaptureError(err, nil)
+		return err
+	}
+
+	return nil
 }
 
 func (p *ImageMonkeyDatabase) ChangeProfilePicture(username string, uuid string) (string, error) {
-    var existingProfilePicture string
-
-    existingProfilePicture = ""
-
-    tx, err := p.db.Begin()
-    if err != nil {
-        log.Debug("[Change Profile Picture] Couldn't begin transaction: ", err.Error())
-        raven.CaptureError(err, nil)
-        return existingProfilePicture, err
-    }
-
-    err = tx.QueryRow(`SELECT COALESCE(a.profile_picture, '') FROM account a WHERE a.name = $1`, username).Scan(&existingProfilePicture)
-    if err != nil {
-        log.Debug("[Change Profile Picture] Couldn't get existing profile picture: ", err.Error())
-        raven.CaptureError(err, nil)
-        return existingProfilePicture, err
-    }
-
-    _, err = tx.Exec(`UPDATE account SET profile_picture = $1 WHERE name = $2`, uuid, username)
-    if err != nil {
-        log.Debug("[Change Profile Picture] Couldn't change profile picture: ", err.Error())
-        raven.CaptureError(err, nil)
-        return existingProfilePicture, err
-    }
-
-
-    err = tx.Commit()
-    if err != nil {
-        log.Debug("[Change Profile Picture] Couldn't commit transaction: ", err.Error())
-        raven.CaptureError(err, nil)
-        return existingProfilePicture, err
-    }
-
-    return existingProfilePicture, nil
+	var existingProfilePicture string
+
+	existingProfilePicture = ""
+
+	tx, err := p.db.Begin()
+	if err != nil {
+		log.Error("[Change Profile Picture] Couldn't begin transaction: ", err.Error())
+		raven.CaptureError(err, nil)
+		return existingProfilePicture, err
+	}
+
+	err = tx.QueryRow(`SELECT COALESCE(a.profile_picture, '') FROM account a WHERE a.name = $1`, username).Scan(&existingProfilePicture)
+	if err != nil {
+		log.Error("[Change Profile Picture] Couldn't get existing profile picture: ", err.Error())
+		raven.CaptureError(err, nil)
+		return existingProfilePicture, err
+	}
+
+	_, err = tx.Exec(`UPDATE account SET profile_picture = $1 WHERE name = $2`, uuid, username)
+	if err != nil {
+		log.Error("[Change Profile Picture] Couldn't change profile picture: ", err.Error())
+		raven.CaptureError(err, nil)
+		return existingProfilePicture, err
+	}
+
+	err = tx.Commit()
+	if err != nil {
+		log.Error("[Change Profile Picture] Couldn't commit transaction: ", err.Error())
+		raven.CaptureError(err, nil)
+		return existingProfilePicture, err
+	}
+
+	return existingProfilePicture, nil
 }
diff --git a/src/web.go b/src/web.go
index 2397b2c5..bd0dc285 100644
--- a/src/web.go
+++ b/src/web.go
@@ -32,9 +32,12 @@ import (
 	"github.com/gomodule/redigo/redis"
 )
 
+var assetVersion string = ""
+
 func ShowErrorPage(c *gin.Context) {
 	c.HTML(404, "404.html", gin.H{
 		"title": "Page not found",
+		"assetVersion": assetVersion,
 	})
 }
 
@@ -70,6 +73,7 @@ func ShowProfilePage(c *gin.Context, imageMonkeyDatabase *imagemonkeydb.ImageMon
 		"sessionInformation": sessionInformation,
 		"apiTokens": apiTokens,
 		"tab": tab,
+		"assetVersion": assetVersion,
 	})
 }
 
@@ -239,6 +243,7 @@ func main() {
 		log.Fatal(err)
 	}
 
+	assetVersion = strconv.FormatInt(int64(time.Now().Unix()), 10)
 
 	//create redis pool
 	redisPool := redis.NewPool(func() (redis.Conn, error) {
@@ -429,6 +434,7 @@ func main() {
 				"annotationRefinementStatistics": commons.Pick(imageMonkeyDatabase.GetAnnotationRefinementStatistics("last-month"))[0],
 				"imageDescriptionStatistics": commons.Pick(imageMonkeyDatabase.GetImageDescriptionStatistics("last-month"))[0],
 				"donationsStatistics": commons.Pick(imageMonkeyDatabase.GetDonationsStatistics("last-month"))[0],
+				"assetVersion": assetVersion,
 			})
 		})
 		router.GET("/donate", func(c *gin.Context) {
@@ -440,6 +446,7 @@ func main() {
 				"words": words,
 				"appIdentifier": webAppIdentifier,
 				"sessionInformation": sessionCookieHandler.GetSessionInformation(c),
+				"assetVersion": assetVersion,
 			})
 		})
 
@@ -489,6 +496,7 @@ func main() {
 				"isModerator" : isModerator,
 				"labelAccessorsLookup": commons.Pick(imageMonkeyDatabase.GetLabelAccessorsMapping())[0],
 				"queryAttributes": parser.GetStaticQueryAttributes(parser.LabelView),
+				"assetVersion": assetVersion,
 			})
 		})
 
@@ -555,6 +563,7 @@ func main() {
 				"sentryDsn": localSentryDsn,
 				"showSkipAnnotationButtons": showSkipAnnotationButtons,
 				"queryAttributes": commons.GetStaticQueryAttributes(),
+				"assetVersion": assetVersion,
 			})
 		})
 
@@ -622,6 +631,7 @@ func main() {
 				"labelAccessors": commons.Pick(imageMonkeyDatabase.GetLabelAccessors())[0],
 				"queryAttributes": commons.GetStaticQueryAttributes(),
 				"sessionInformation": sessionCookieHandler.GetSessionInformation(c),
+				"assetVersion": assetVersion,
 			})
 		})
 		router.GET("/verify_annotation", func(c *gin.Context) {
@@ -631,6 +641,7 @@ func main() {
 				"apiBaseUrl": apiBaseUrl,
 				"appIdentifier": webAppIdentifier,
 				"sessionInformation": sessionCookieHandler.GetSessionInformation(c),
+				"assetVersion": assetVersion,
 			})
 		})
 		router.GET("/quiz", func(c *gin.Context) {
@@ -641,6 +652,7 @@ func main() {
 				"activeMenuNr": 7,
 				"apiBaseUrl": apiBaseUrl,
 				"sessionInformation": sessionCookieHandler.GetSessionInformation(c),
+				"assetVersion": assetVersion,
 			})
 		})	
 		router.GET("/refine", func(c *gin.Context) {
@@ -655,6 +667,7 @@ func main() {
 				"labels": labelRefinementsMap,
 				"labelAccessors": commons.Pick(imageMonkeyDatabase.GetLabelAccessors())[0],
 				"labelCategories": commons.Pick(imageMonkeyDatabase.GetLabelCategories())[0],
+				"assetVersion": assetVersion,
 			})
 		})
 		router.GET("/statistics", func(c *gin.Context) {
@@ -665,6 +678,7 @@ func main() {
 				"statistics": commons.Pick(imageMonkeyDatabase.Explore(words))[0],
 				"apiBaseUrl": apiBaseUrl,
 				"sessionInformation": sessionCookieHandler.GetSessionInformation(c),
+				"assetVersion": assetVersion,
 			})
 		})
 		router.GET("/explore", func(c *gin.Context) {
@@ -684,6 +698,7 @@ func main() {
 				"labelAccessors": commons.Pick(imageMonkeyDatabase.GetLabelAccessors())[0],
 				"sessionInformation": sessionCookieHandler.GetSessionInformation(c),
 				"queryInfo": queryInfo,
+				"assetVersion": assetVersion,
 			})
 		})
 		router.GET("/apps", func(c *gin.Context) {
@@ -692,6 +707,7 @@ func main() {
 				"activeMenuNr": 10,
 				"apiBaseUrl": apiBaseUrl,
 				"sessionInformation": sessionCookieHandler.GetSessionInformation(c),
+				"assetVersion": assetVersion,
 			})
 		})
 		router.GET("/playground", func(c *gin.Context) {
@@ -701,6 +717,7 @@ func main() {
 				"apiBaseUrl": apiBaseUrl,
 				"playgroundPredictBaseUrl": playgroundBaseUrl,
 				"sessionInformation": sessionCookieHandler.GetSessionInformation(c),
+				"assetVersion": assetVersion,
 			})
 		})
 		router.GET("/login", func(c *gin.Context) {
@@ -716,9 +733,19 @@ func main() {
 					"apiBaseUrl": apiBaseUrl,
 					"activeMenuNr": 12,
 					"sessionInformation": sessionInformation,
+					"assetVersion": assetVersion,
 				})
 			}
 		})
+		router.GET("/privacy", func(c *gin.Context) {
+			c.HTML(http.StatusOK, "privacy.html", gin.H{
+				"title": "Privacy Policy",
+				"activeMenuNr": -1,
+				"sessionInformation": sessionCookieHandler.GetSessionInformation(c),
+				"assetVersion": assetVersion,
+				"apiBaseUrl": apiBaseUrl,
+			})
+		})
 
 		router.GET("/signup", func(c *gin.Context) {
 			sessionInformation := sessionCookieHandler.GetSessionInformation(c)
@@ -732,6 +759,7 @@ func main() {
 					"apiBaseUrl": apiBaseUrl,
 					"activeMenuNr": -1,
 					"sessionInformation": sessionInformation,
+					"assetVersion": assetVersion,
 				})
 			}
 		})
@@ -750,6 +778,7 @@ func main() {
 				"apiBaseUrl": apiBaseUrl,
 				"activeMenuNr": 13,
 				"sessionInformation": sessionCookieHandler.GetSessionInformation(c),
+				"assetVersion": assetVersion,
 			})
 		})
 
@@ -760,6 +789,7 @@ func main() {
 				"activeMenuNr": -1,
 				"publicBackups": publicBackups,
 				"sessionInformation": sessionCookieHandler.GetSessionInformation(c),
+				"assetVersion": assetVersion,
 			})
 		})
 
@@ -789,6 +819,7 @@ func main() {
 				"defaultLabelGraphName": labelGraphName,
 				"editorMode" : editorMode,
 				"repository": "https://github.com/bbernhard/imagemonkey-core",
+				"assetVersion": assetVersion,
 			})
 		})
 
@@ -800,6 +831,7 @@ func main() {
 				"trendingLabelsRepositoryUrl": *trendingLabelsRepositoryUrl,
 				"labelsRepositoryUrl": *labelsRepositoryUrl,
 				"sessionInformation": sessionCookieHandler.GetSessionInformation(c),
+				"assetVersion": assetVersion,
 			})
 		})
 
@@ -817,6 +849,7 @@ func main() {
 				"activeMenuNr": -1,
 				//"activeMenuNr": 14,
 				"sessionInformation": sessionInformation,
+				"assetVersion": assetVersion,
 			})
 		})
 
@@ -846,6 +879,7 @@ func main() {
 				"activeMenuNr": -1,
 				"sessionInformation": sessionInformation,
 				"mode": mode,
+				"assetVersion": assetVersion,
 			})
 		})
 
@@ -857,6 +891,8 @@ func main() {
 				"activeMenuNr": 16,
 				"sessionInformation": sessionInformation,
 				"models": availableModels,
+				"assetVersion": assetVersion,
+				"apiBaseUrl": apiBaseUrl,
 			})
 		})
 
diff --git a/tests/database.go b/tests/database.go
index 0a9a6da6..c7d65074 100644
--- a/tests/database.go
+++ b/tests/database.go
@@ -1483,3 +1483,14 @@ func (p *ImageMonkeyDatabase) CloseAllTrendingLabelTasks() error {
 	_, err := p.db.Exec("UPDATE trending_label_suggestion SET closed = true")
 	return err
 }
+
+func (p *ImageMonkeyDatabase) GetNumOfImagesInImageCollection(username string, imageCollectionName string) (int, error) {
+	var num int
+	err := p.db.QueryRow(`SELECT count(*) 
+							FROM image_collection_image ici
+							JOIN image i ON i.id = ici.image_id
+							JOIN user_image_collection u ON u.id = ici.user_image_collection_id
+							JOIN account a ON u.account_id = a.id
+							WHERE a.name = $1 AND u.name = $2`, username, imageCollectionName).Scan(&num)
+	return num, err
+}
diff --git a/tests/game_test.go b/tests/game_test.go
index 099932ff..d14c24b5 100644
--- a/tests/game_test.go
+++ b/tests/game_test.go
@@ -2,7 +2,9 @@ package tests
 
 import (
 	"testing"
+	"time"
 	"gopkg.in/resty.v1"
+	commons "github.com/bbernhard/imagemonkey-core/commons"
 	datastructures "github.com/bbernhard/imagemonkey-core/datastructures"
 )
 
@@ -133,3 +135,328 @@ func TestGetImageHuntStatsShouldFailDueToWrongToken(t *testing.T) {
 
 	testGetImageHuntStats(t, "user", userToken1, 403)
 }
+
+func TestAchievementBadgesNoAchievements(t *testing.T) {
+	achievementsGenerator := commons.NewAchievementsGenerator()
+	achievementsGenerator.Add(time.Now())
+
+	achievements, err := achievementsGenerator.GetAchievements("")
+	ok(t, err)
+	for _, achievement := range achievements {
+		equals(t, achievement.Accomplished, false)
+	}
+}
+
+func TestAchievementBadgesWeekendWarrior(t *testing.T) {
+	achievementsGenerator := commons.NewAchievementsGenerator()
+	achievementsGenerator.SetNumOfAvailableLabels(15)
+
+	//three consecutive weekends in a row	
+	t1 := time.Date(2019, time.November, 2, 23, 0, 0, 0, time.UTC)
+	t2 := time.Date(2019, time.November, 9, 14, 0, 0, 0, time.UTC)
+	t3 := time.Date(2019, time.November, 16, 17, 0, 0, 0, time.UTC)
+	achievementsGenerator.Add(t1)
+	achievementsGenerator.Add(t2)
+	achievementsGenerator.Add(t3)
+
+	achievements, err := achievementsGenerator.GetAchievements("")
+	ok(t, err)
+	for _, achievement := range achievements {
+		if achievement.Name == "Weekend Warrior" {
+			equals(t, achievement.Accomplished, true)
+		} else {
+			equals(t, achievement.Accomplished, false)
+		}
+	}
+}
+
+
+func TestAchievementBadgesWeekendWarrior1(t *testing.T) {
+	achievementsGenerator := commons.NewAchievementsGenerator()
+	achievementsGenerator.SetNumOfAvailableLabels(15)
+
+	//two consecutive weekends in a row, then a gap
+	t1 := time.Date(2019, time.November, 2, 23, 0, 0, 0, time.UTC)
+	t2 := time.Date(2019, time.November, 9, 14, 0, 0, 0, time.UTC)
+	t3 := time.Date(2019, time.November, 15, 17, 0, 0, 0, time.UTC)
+	achievementsGenerator.Add(t1)
+	achievementsGenerator.Add(t2)
+	achievementsGenerator.Add(t3)
+
+	achievements, err := achievementsGenerator.GetAchievements("")
+	ok(t, err)
+	for _, achievement := range achievements {
+		equals(t, achievement.Accomplished, false)
+	}
+}
+
+func TestAchievementBadgesWeekendWarrior2(t *testing.T) {
+	achievementsGenerator := commons.NewAchievementsGenerator()
+	achievementsGenerator.SetNumOfAvailableLabels(15)
+
+	//two consecutive weekends in a row, then a gap and three consecutive weekens in a row
+	t1 := time.Date(2019, time.November, 2, 23, 0, 0, 0, time.UTC)
+	t2 := time.Date(2019, time.November, 9, 14, 0, 0, 0, time.UTC)
+	t3 := time.Date(2019, time.November, 15, 17, 0, 0, 0, time.UTC)
+	t4 := time.Date(2019, time.November, 23, 16, 15, 18, 0, time.UTC)
+	t5 := time.Date(2019, time.November, 30, 17, 10, 0, 0, time.UTC)
+	t6 := time.Date(2019, time.December, 7, 17, 20, 0, 0, time.UTC)
+	achievementsGenerator.Add(t1)
+	achievementsGenerator.Add(t2)
+	achievementsGenerator.Add(t3)
+	achievementsGenerator.Add(t4)
+	achievementsGenerator.Add(t5)
+	achievementsGenerator.Add(t6)
+
+	achievements, err := achievementsGenerator.GetAchievements("")
+	ok(t, err)
+	for _, achievement := range achievements {
+		if achievement.Name == "Weekend Warrior" {
+			equals(t, achievement.Accomplished, true)
+		} else {
+			equals(t, achievement.Accomplished, false)
+		}
+	}
+}
+
+func TestAchievementBadgesWeekendWarrior3(t *testing.T) {
+	achievementsGenerator := commons.NewAchievementsGenerator()
+	achievementsGenerator.SetNumOfAvailableLabels(15)
+
+	//three consecutive  weekends in a row, then a gap
+	t1 := time.Date(2019, time.November, 2, 23, 0, 0, 0, time.UTC)
+	t2 := time.Date(2019, time.November, 9, 14, 0, 0, 0, time.UTC)
+	t3 := time.Date(2019, time.November, 16, 17, 0, 0, 0, time.UTC)
+	t4 := time.Date(2019, time.December, 10, 16, 15, 18, 0, time.UTC)
+	achievementsGenerator.Add(t1)
+	achievementsGenerator.Add(t2)
+	achievementsGenerator.Add(t3)
+	achievementsGenerator.Add(t4)
+
+	achievements, err := achievementsGenerator.GetAchievements("")
+	ok(t, err)
+	for _, achievement := range achievements {
+		if achievement.Name == "Weekend Warrior" {
+			equals(t, achievement.Accomplished, true)
+		} else {
+			equals(t, achievement.Accomplished, false)
+		}
+	}
+}
+
+func TestAchievementBadgesWorkerBee(t *testing.T) {
+	achievementsGenerator := commons.NewAchievementsGenerator()
+	achievementsGenerator.SetNumOfAvailableLabels(15)
+
+	//worker bee = at least 7 consecutive days
+	for i := 0; i < 7; i++ {
+		t := time.Date(2019, time.February, 25+i, 23, 0, 0, 0, time.UTC)
+		achievementsGenerator.Add(t)
+	}
+
+	achievements, err := achievementsGenerator.GetAchievements("")
+	ok(t, err)
+	for _, achievement := range achievements {
+		if achievement.Name == "Worker Bee" {
+			equals(t, achievement.Accomplished, true)
+		} else {
+			equals(t, achievement.Accomplished, false)
+		}
+	}
+}
+
+func TestAchievementBadgesWorkerBee1(t *testing.T) {
+	achievementsGenerator := commons.NewAchievementsGenerator()
+	achievementsGenerator.SetNumOfAvailableLabels(15)
+
+	for i := 0; i < 6; i++ {
+		t := time.Date(2019, time.February, 25+i, 23, 0, 0, 0, time.UTC)
+		achievementsGenerator.Add(t)
+	}
+
+	//no worker bee if < 7 consecutive days
+	achievements, err := achievementsGenerator.GetAchievements("")
+	ok(t, err)
+	for _, achievement := range achievements {
+		equals(t, achievement.Accomplished, false)
+	}
+}
+
+func TestAchievementBadgesWorkerBee2(t *testing.T) {
+	achievementsGenerator := commons.NewAchievementsGenerator()
+	achievementsGenerator.SetNumOfAvailableLabels(15)
+
+	//3 consecutive days
+	for i := 0; i < 3; i++ {
+		t := time.Date(2019, time.February, 25+i, 23, 0, 0, 0, time.UTC)
+		achievementsGenerator.Add(t)
+	}
+
+	//5 consecutive days
+	for i := 0; i < 5; i++ {
+		t := time.Date(2019, time.February, 10+i, 23, 0, 0, 0, time.UTC)
+		achievementsGenerator.Add(t)
+	}
+
+	//but still no worker bee
+	achievements, err := achievementsGenerator.GetAchievements("")
+	ok(t, err)
+	for _, achievement := range achievements {
+		equals(t, achievement.Accomplished, false)
+	}
+}
+
+func TestAchievementBadgesEarlyBird1(t *testing.T) {
+	achievementsGenerator := commons.NewAchievementsGenerator()
+	achievementsGenerator.SetNumOfAvailableLabels(15)
+
+	//3 consecutive days (but wrong time)
+	for i := 0; i < 3; i++ {
+		t := time.Date(2019, time.February, 25+i, 23, 0, 0, 0, time.UTC)
+		achievementsGenerator.Add(t)
+	}
+
+	//so still no early bird
+	achievements, err := achievementsGenerator.GetAchievements("")
+	ok(t, err)
+	for _, achievement := range achievements {
+		equals(t, achievement.Accomplished, false)
+	}
+}
+
+func TestAchievementBadgesEarlyBird2(t *testing.T) {
+	achievementsGenerator := commons.NewAchievementsGenerator()
+	achievementsGenerator.SetNumOfAvailableLabels(15)
+
+	//3 consecutive days (right time)
+	for i := 0; i < 3; i++ {
+		t := time.Date(2019, time.February, 25+i, 5, 10+i, 0, 0, time.UTC)
+		achievementsGenerator.Add(t)
+	}
+
+	//so we are an early bird
+	achievements, err := achievementsGenerator.GetAchievements("")
+	ok(t, err)
+	for _, achievement := range achievements {
+		if achievement.Name == "Early Bird" {
+			equals(t, achievement.Accomplished, true)
+		} else {
+			equals(t, achievement.Accomplished, false)
+		}
+	}
+}
+
+
+func TestAchievementBadgesEarlyBird3(t *testing.T) {
+	achievementsGenerator := commons.NewAchievementsGenerator()
+	achievementsGenerator.SetNumOfAvailableLabels(15)
+
+	//4 consecutive days (but last two have wrong time)
+	for i := 0; i < 4; i++ {
+		var tt time.Time
+		if i == 2 || i == 3 {
+			tt = time.Date(2019, time.February, 25+i, 10, 0, 0, 0, time.UTC)
+		} else {
+			tt = time.Date(2019, time.February, 25+i, 5, 10+i, 0, 0, time.UTC)
+		}
+		achievementsGenerator.Add(tt)
+	}
+
+	//so still no early bird
+	achievements, err := achievementsGenerator.GetAchievements("")
+	ok(t, err)
+	for _, achievement := range achievements {
+		equals(t, achievement.Accomplished, false)
+	}
+}
+
+func TestAchievementBadgesNightOwl1(t *testing.T) {
+	achievementsGenerator := commons.NewAchievementsGenerator()
+	achievementsGenerator.SetNumOfAvailableLabels(15)
+
+	//3 consecutive days (but wrong time)
+	for i := 0; i < 3; i++ {
+		t := time.Date(2019, time.February, 25+i, 15, 0, 0, 0, time.UTC)
+		achievementsGenerator.Add(t)
+	}
+
+	//so still no night owl
+	achievements, err := achievementsGenerator.GetAchievements("")
+	ok(t, err)
+	for _, achievement := range achievements {
+		equals(t, achievement.Accomplished, false)
+	}
+}
+
+func TestAchievementBadgesNightOwl2(t *testing.T) {
+	achievementsGenerator := commons.NewAchievementsGenerator()
+	achievementsGenerator.SetNumOfAvailableLabels(15)
+
+	//3 consecutive days (right time)
+	for i := 0; i < 3; i++ {
+		t := time.Date(2019, time.February, 25+i, 0, 10+i, 0, 0, time.UTC)
+		achievementsGenerator.Add(t)
+	}
+
+	//so we are an night owl
+	achievements, err := achievementsGenerator.GetAchievements("")
+	ok(t, err)
+	for _, achievement := range achievements {
+		if achievement.Name == "Night Owl" {
+			equals(t, achievement.Accomplished, true)
+		} else {
+			equals(t, achievement.Accomplished, false)
+		}
+	}
+}
+
+func TestAchievementBadgesNightOwl3(t *testing.T) {
+	achievementsGenerator := commons.NewAchievementsGenerator()
+	achievementsGenerator.SetNumOfAvailableLabels(15)
+
+	//4 consecutive days (but last two have wrong time)
+	for i := 0; i < 4; i++ {
+		var tt time.Time
+		if i == 2 || i == 3 {
+			tt = time.Date(2019, time.February, 25+i, 0, 40+i, 0, 0, time.UTC)
+		} else {
+			tt = time.Date(2019, time.February, 25+i, 5, 10+i, 0, 0, time.UTC)
+		}
+		achievementsGenerator.Add(tt)
+	}
+
+	//so still no night owl
+	achievements, err := achievementsGenerator.GetAchievements("")
+	ok(t, err)
+	for _, achievement := range achievements {
+		equals(t, achievement.Accomplished, false)
+	}
+}
+
+func TestAchievementBadges1(t *testing.T) {
+	achievementsGenerator := commons.NewAchievementsGenerator()
+	achievementsGenerator.SetNumOfAvailableLabels(80)
+
+
+	for i := 0; i < 60; i++ {
+		var tt time.Time
+		if i < 10 {
+			tt = time.Date(2019, time.February, 25, 0, 0+i, 0, 0, time.UTC)
+		} else {
+			tt = time.Date(2019, time.February, 25+i, 15, 0+i, 0, 0, time.UTC)
+		}
+		achievementsGenerator.Add(tt)
+	}
+
+	achievements, err := achievementsGenerator.GetAchievements("")
+	ok(t, err)
+	for _, achievement := range achievements {
+		if achievement.Name == "Ant Power" || achievement.Name == "Worker Bee" {
+			equals(t, achievement.Accomplished, true)
+		} else {
+			equals(t, achievement.Accomplished, false)
+		}
+	}
+}
+
+
diff --git a/tests/image_collection_test.go b/tests/image_collection_test.go
index 8c2dafab..06a88c6c 100644
--- a/tests/image_collection_test.go
+++ b/tests/image_collection_test.go
@@ -3,6 +3,7 @@ package tests
 import (
 	"testing"
 	"gopkg.in/resty.v1"
+	"sort"
 	datastructures "github.com/bbernhard/imagemonkey-core/datastructures"
 )
 
@@ -124,13 +125,18 @@ func TestGetImageCollectionSuccess(t *testing.T) {
 	token := testLogin(t, "user", "pwd", 200)
 
 	imageCollections := testGetImageCollections(t, "user", token, 200)
-	equals(t, len(imageCollections), 0)
+	equals(t, len(imageCollections), 2)
+
+	sort.SliceStable(imageCollections, func(i, j int) bool { return imageCollections[i].Name < imageCollections[j].Name })
+
+	equals(t, imageCollections[0].Name, "my donations")
+	equals(t, imageCollections[1].Name, "my open tasks")
 
 	testAddImageCollection(t, "user", token, "new-image-collection", "my-new-image-collection", 201)
 
 
 	imageCollections = testGetImageCollections(t, "user", token, 200)
-	equals(t, len(imageCollections), 1)
+	equals(t, len(imageCollections), 3)
 }
 
 func TestGetImageCollectionsFailsDueToWrongToken(t *testing.T) {
@@ -237,6 +243,36 @@ func TestDonateImageAndAssignToImageCollection(t *testing.T) {
 }
 
 
+func TestImageGetsAssignedToMyDonationsImageCollection(t *testing.T) {
+	teardownTestCase := setupTestCase(t)
+	defer teardownTestCase(t)
+
+	testSignUp(t, "user", "pwd", "user@imagemonkey.io")
+	token := testLogin(t, "user", "pwd", 200)
+
+	testSignUp(t, "user2", "pwd", "user2@imagemonkey.io")
+
+	imageCollections := testGetImageCollections(t, "user", token, 200)
+	equals(t, len(imageCollections), 2) //per default a user has already created 2 image collections (my donations + my open tasks)
+
+	sort.SliceStable(imageCollections, func(i, j int) bool { return imageCollections[i].Name < imageCollections[j].Name })
+
+	equals(t, imageCollections[0].Name, "my donations")
+	equals(t, imageCollections[1].Name, "my open tasks")
+
+	testDonate(t, "./images/apples/apple1.jpeg", "apple", true, token, "", 200) 
+
+	numOfImagesInImageCollection, err := db.GetNumOfImagesInImageCollection("user", "my donations")
+	ok(t, err)
+	equals(t, numOfImagesInImageCollection, 1)
+
+
+	numOfImagesInImageCollectionOfOtherUser, err := db.GetNumOfImagesInImageCollection("user2", "my donations")
+	ok(t, err)
+	equals(t, numOfImagesInImageCollectionOfOtherUser, 0)
+}
+
+
 //temporarily disabled, as it doesn't work
 /*func TestDonateImageCouldntAssignToImageCollectionAsImageCollectionDoesntExit(t *testing.T) {
 	teardownTestCase := setupTestCase(t)
diff --git a/tests/ui/client.py b/tests/ui/client.py
index 316320f5..2cff346c 100644
--- a/tests/ui/client.py
+++ b/tests/ui/client.py
@@ -219,6 +219,10 @@ def logout(self):
         wait = WebDriverWait(self._driver, 10)
         wait.until(EC.title_is("ImageMonkey"))
 
+    @check_for_errors
+    def navigate_to(self, endpoint):
+        self._driver.get(BASE_URL + "/" + endpoint)
+
     @check_for_errors
     def signup(self, username, email, password):
         self._driver.get(BASE_URL + "/signup")
diff --git a/tests/ui/test_all_pages.py b/tests/ui/test_all_pages.py
new file mode 100644
index 00000000..0b1b7cd6
--- /dev/null
+++ b/tests/ui/test_all_pages.py
@@ -0,0 +1,38 @@
+from selenium import webdriver
+import os
+import unittest
+import helper
+from client import ImageMonkeyWebClient
+from webdriver import ImageMonkeyChromeWebDriver
+
+
+class TestAllPages(unittest.TestCase):
+    def setUp(self):
+        helper.initialize_with_moderator()
+        self._driver = ImageMonkeyChromeWebDriver()
+        self._client = ImageMonkeyWebClient(self._driver) 
+
+    def test_open_all_pages_once(self):
+        self._client.donate(os.path.abspath(".." + os.path.sep + "images" + os.path.sep + "apples" + os.path.sep + "apple2.jpeg"), True)
+        self._client.login("moderator", "moderator", True)
+        self._client.unlock_image()
+        self._client.label_image(["floor", "wall"])
+        
+        
+        endpoints = ["donate", "explore", "label?mode=default", "label?mode=browse", "label?type=image&mode=default", "label?type=image&mode=browse", "annotate?mode=default", "annotate?mode=browse", "annotate?mode=default&view=unified", "annotate?mode=browse&view=unified", "verify?mode=default", "verify?mode=browse", "verify_annotation", "refine?mode=browse", "statistics", "libraries", "models", "apps", "blog", "playground", "privacy"] #graph
+        
+        #check endpoints twice; once logged in and once logged out
+        for i in range(2):
+            if i == 1:
+                self._client.logout()
+                print("\n\nRun again logged out\n\n")
+            for endpoint in endpoints:
+                print("Testing endpoint %s" %endpoint, flush=True)
+            
+                try:
+                    self._client.navigate_to(endpoint)
+                except Exception as e:
+                    # no auto annotations available, so the error is normal
+                    if "annotate?add_auto_annotations=true - Failed to load resource: the server responded with a status of 422 (Unprocessable Entity)":
+                        continue
+                    raise e