Add full_count to queries