#245 - Refactor search some more