Completed ticket #28 Improve search process