Moved SEARCH to separate file. Housekeeping for Data Listing.