Improve formatting of Search Return blocks