#69 Some cleanup of the search controller