More search changes
More search changes, removing unused import