Fixed query behaviour replacing or_ with and_