Add filters & order to get_all_states