Modifications for search-based lookup and on-demand processing.