Improve combinaison of $or with other queries