Flip comparitors (they were wrong), removing $and clause (not needed)