updated query and filters