Several fixes & new action for search.
Merge branch 'master' into arusso