fix for last word in searchterm
Merge branch 'master' into jupis