Improving search_mapping as per suggestion
Improve rake task as per suggestion