Merge "API: Use ct_tag_id in queries when applicable"