fixed search with AND, codestyle [skip ci]