Merge pull request #199 from Useful-Innovation/johans-fixes

fixed bug with search