Cleaning up search results and adding include-attrs parameter