Remove references to $database from search provider and queue
Abstract database references from IndexUtils