Search criteria for branch. Todo: make tests, not war
Fix search criteries, add some tests
PSR-2 fix
Merge branch 'WAPI-11086'