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

fixed search to include estimates