store_search --Naming convention changes, TODO comments