Some better filter options and better use of get_query_var