Clean up search controller, add specs