Delegate into substitute search combo box - colorful entries in
selection list.
Cleanup comments and add TODO entries