Fix _get_filtered_query