Much improved search functionality.