diff --git a/.gitlab-ci.yaml b/.gitlab-ci.yaml
index c86b213167eee536951f1bbf04334e03662b873d..2f0082f4ebe4e5924465e356c302f66a26c99c06 100644
--- a/.gitlab-ci.yaml
+++ b/.gitlab-ci.yaml
@@ -284,23 +284,23 @@ follow_api_smoketest:
     reports:
       junit: api_smoketest_follow_api.xml
 
-tags_api_smoketest_old:
+tags_api_smoketest:
   <<: *common_api_smoketest_job
 
   script:
-    - scripts/ci_start_api_smoketest.sh localhost "$HIVEMIND_HTTP_PORT" test_tags_api_patterns.tavern.yaml api_smoketest_tags_api_old.xml
+    - scripts/ci_start_api_smoketest.sh localhost "$HIVEMIND_HTTP_PORT" tags_api_patterns/ api_smoketest_tags_api.xml
 
   artifacts:
     reports:
-      junit: api_smoketest_tags_api_old.xml
+      junit: api_smoketest_tags_api.xml
 
-tags_api_smoketest:
+tags_api_smoketest_negative:
   <<: *common_api_smoketest_job
 
   script:
-    - scripts/ci_start_api_smoketest.sh localhost "$HIVEMIND_HTTP_PORT" tags_api_patterns/ api_smoketest_tags_api.xml
+    - scripts/ci_start_api_smoketest.sh localhost "$HIVEMIND_HTTP_PORT" tags_api_negative/ api_smoketest_tags_api_negative.xml
 
   artifacts:
     reports:
-      junit: api_smoketest_tags_api.xml
+      junit: api_smoketest_tags_api_negative.xml
 
diff --git a/hive/server/condenser_api/cursor.py b/hive/server/condenser_api/cursor.py
index 6a829832db9f07ea04436768e0e4a150a7d35d89..91740918ee8415a1feff49e404fb02a1287406cd 100644
--- a/hive/server/condenser_api/cursor.py
+++ b/hive/server/condenser_api/cursor.py
@@ -21,7 +21,7 @@ async def get_post_id(db, author, permlink):
         INNER JOIN hive_accounts ha_a ON ha_a.id = hp.author_id
         INNER JOIN hive_permlink_data hpd_p ON hpd_p.id = hp.permlink_id
         WHERE ha_a.name = :author AND hpd_p.permlink = :permlink
-            AND counter_deleted = 0 LIMIT 1""" # ABW: replace with find_comment_id(:author,:permlink)?
+            AND counter_deleted = 0 LIMIT 1""" # ABW: replace with find_comment_id(:author,:permlink,True)?
     return await db.query_one(sql, author=author, permlink=permlink)
 
 async def get_child_ids(db, post_id):
@@ -190,8 +190,8 @@ async def pids_by_query(db, sort, start_author, start_permlink, limit, tag):
             where.append(sql)
 
     start_id = None
-    if start_permlink and start_author:
-        sql = "%s <= (SELECT %s FROM %s WHERE id = find_comment_id('{}', '{}'))".format(start_author, start_permlink)
+    if start_permlink or start_author:
+        sql = "%s <= (SELECT %s FROM %s WHERE id = find_comment_id('{}', '{}', True))".format(start_author, start_permlink)
         where.append(sql % (field, raw_field, table))
 
     sql = """
diff --git a/tests/tests_api b/tests/tests_api
index 9f6058b31adec6378ead1b15ae6c1e7bb75823f7..43f46f320af704f4ac173005696ab8526e8d08f2 160000
--- a/tests/tests_api
+++ b/tests/tests_api
@@ -1 +1 @@
-Subproject commit 9f6058b31adec6378ead1b15ae6c1e7bb75823f7
+Subproject commit 43f46f320af704f4ac173005696ab8526e8d08f2