diff --git a/frontend/src/uxbox/main/repo/icons.cljs b/frontend/src/uxbox/main/repo/icons.cljs
index 4eab532718..4e1612c496 100644
--- a/frontend/src/uxbox/main/repo/icons.cljs
+++ b/frontend/src/uxbox/main/repo/icons.cljs
@@ -40,10 +40,9 @@
 
 (defmethod request :fetch/icons
   [_ {:keys [coll]}]
-  (let [url (if coll
-              (str url "/library/icon-collections/" coll "/icons")
-              (str url "/library/icon-collections/icons"))
-        params {:url url :method :get}]
+  (let [url (str url "/library/icons")
+        qp (if coll {:collection coll} nil)
+        params {:url url :method :get :query qp}]
     (send! params)))
 
 (defmethod request :fetch/icon
diff --git a/frontend/src/uxbox/main/repo/images.cljs b/frontend/src/uxbox/main/repo/images.cljs
index 0d8b287f87..d646220cc2 100644
--- a/frontend/src/uxbox/main/repo/images.cljs
+++ b/frontend/src/uxbox/main/repo/images.cljs
@@ -40,10 +40,9 @@
 
 (defmethod request :fetch/images
   [_ {:keys [coll]}]
-  (let [url (if coll
-              (str url "/library/image-collections/" coll "/images")
-              (str url "/library/image-collections/images"))
-        params {:url url :method :get}]
+  (let [url (str url "/library/images")
+        qp  (when coll {:collection coll})
+        params {:url url :method :get :query qp}]
     (send! params)))
 
 (defmethod request :fetch/image
diff --git a/frontend/src/uxbox/main/repo/kvstore.cljs b/frontend/src/uxbox/main/repo/kvstore.cljs
index 14cbc90aef..b996ccb29e 100644
--- a/frontend/src/uxbox/main/repo/kvstore.cljs
+++ b/frontend/src/uxbox/main/repo/kvstore.cljs
@@ -7,6 +7,7 @@
 (ns uxbox.main.repo.kvstore
   "A main interface for access to remote resources."
   (:require [beicon.core :as rx]
+            [cuerdas.core :as str]
             [uxbox.config :refer (url)]
             [uxbox.main.repo.impl :refer (request send!)]
             [uxbox.util.transit :as t]))
@@ -17,7 +18,7 @@
         params {:url url :method :get}]
     (->> (send! params)
          (rx/map (fn [{:keys [payload] :as response}]
-                   (if (nil? payload)
+                   (if (or (nil? payload) (str/empty? payload))
                      (assoc response :payload {:key id :value nil :version nil})
                      response))))))