fixes some issues on search, updates UI
Merge branch 'master' of https://github.com/guillaume-gouchon/nanar