added 'and' and 'or' search, empty search causes error