Change logic of searching by profile and query
Merge remote-tracking branch 'origin/master'