Add support for longer search results