updated for search functionality : 2/2/2014