fixed $and/$or selectors being pushed when empty
Merge branch 'devel' of github.com-tempworks:Exartu/Exartu-CRM into devel