Add and as well as or search criteria implementation