Updated code to consolidate the DataPromise code and allow global searching