see extended description

- added future "search by query";
- added stupid "search by query"-functionality;
- mini-refactoring;