diff --git a/src/database/queue.c b/src/database/queue.c
index 3fdd6af52e1d4ad6cae136b6e3f58e7ee35f1edb..fae9861766a7005210ef13fb4c23a0f60a250cc9 100644
--- a/src/database/queue.c
+++ b/src/database/queue.c
@@ -207,22 +207,6 @@ error:
     return false;
 }
 
-#define database_queue_add(suffix, column_name)                                             \
-    bool                                                                                    \
-    database_queue_add_ ## suffix (volatile sqlite3 *db, const char *query, int priority)   \
-    {                                                                                       \
-        bool status = queue_add_with_col_like_str(db, column_name, query, priority);        \
-        LOG_INFO("%s " #suffix " '%s' with priority of %d",                                 \
-                 status ? "Successfully added" : "Failed to add", query, priority);         \
-        return status;                                                                      \
-    }
-database_queue_add(query,    LKT_DATABASE_KARA_ALL)
-database_queue_add(author,   LKT_DATABASE_NAME_KAUTHOR)
-database_queue_add(language, LKT_DATABASE_NAME_KLANG)
-database_queue_add(category, LKT_DATABASE_NAME_KCAT)
-database_queue_add(type,     LKT_DATABASE_NAME_KTYPE)
-#undef database_queue_add
-
 bool
 database_queue_add_id(volatile sqlite3 *db, int id, int priority)
 {
@@ -245,17 +229,17 @@ database_queue_add_uri(volatile sqlite3 *db, struct lkt_uri *uri, int priority)
     switch (uri->type) {
     case uri_query:
     case uri_fs:
-        return database_queue_add_query(db, uri->value, priority);
+        return queue_add_with_col_like_str(db, LKT_DATABASE_KARA_ALL, uri->value, priority);
     case uri_id:
         return database_queue_add_id(db, *(int *) uri->value, priority);
     case uri_type:
-        return database_queue_add_type(db, (char *) uri->value, priority);
+        return queue_add_with_col_like_str(db, LKT_DATABASE_NAME_KTYPE, uri->value, priority);
     case uri_category:
-        return database_queue_add_category(db, (char *) uri->value, priority);
+        return queue_add_with_col_like_str(db, LKT_DATABASE_NAME_KCAT, uri->value, priority);
     case uri_language:
-        return database_queue_add_language(db, (char *) uri->value, priority);
+        return queue_add_with_col_like_str(db, LKT_DATABASE_NAME_KLANG, uri->value, priority);
     case uri_author:
-        return database_queue_add_author(db, (char *) uri->value, priority);
+        return queue_add_with_col_like_str(db, LKT_DATABASE_NAME_KAUTHOR, uri->value, priority);
     case uri_playlist:
         return database_queue_add_plt(db, (char *) uri->value, priority);
     default: