Stop results unwrapping; add option for search query to be used