improve merge selectors to keep client-side '$or' filters