fixed "$or" queries that were overriding themselves