Story 46435315: WIP: Search added to control mapper dialog