Improved search response to include type so the search knows how to handle it