Merge pull request #233 from Bohdan-Tereta/development

Issue #230 improvements
Issue #143 search field related bug fixed