Add SMART_SEARCH