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

fixed bug with search