Fix problems with search and preferences
Merge branch 'master' of github.com:irukavina/zdravko