Some formatting cleanup in search