Search improved, favs working
Merge branch 'master' of https://github.com/xgeuariogwe/iMat