Tracks search improvements and fixes. Code cleanup.
Merge branch 'master' of https://github.com/andreasellervee/EMMtarkvaraprojekt