Merge pull request 'master' (#14) from master into dev

Reviewed-on: #14

src/inc/routeinc/f0cklib.mjs

@@ -233,14 +233,14 @@ export default {
       items = db`
         select *
         from "items"
-        ${tag
+        ${ tag
           ? db`
             inner join (
-              select "tags_assign".item_id, "tags".tag
+              select "tags_assign".item_id, "tags_assign".tag_id, "tags".tag
               from "tags"
               left join "tags_assign" on "tags_assign".tag_id = "tags".id
               where "tags".tag ilike ${'%' + tag + '%'}
-              group by "tags_assign".item_id, "tags".tag
+              group by "tags_assign".item_id, "tags_assign".tag_id, "tags".tag
             ) as st on st.item_id = "items".id`
           : db``
         }
@@ -254,7 +254,7 @@ export default {
           : db``
         }
         ${ tag
-          ? db`group by st.item_id, "items".id, "tags_assign".tag_id`
+          ? db`group by st.item_id, "items".id, st.tag, st.tag_id`
           : db`group by "items".id`
         }
         order by "items".id desc