Much improved search results formatting and code structure