Merge pull request #553 from leider/master

fix for #500 and another (not yet reported) wikibug
fixing bug in wiki search
cleanup
clearer UI for search results that are matched via filename