[OE-3760] added groundwork for advanced search functionality.