Updated tag query to show all