Improved search controller, more tests