more minor search controller and model fixes