Improve search format