More work getting Find/Replace toolbars usable in real applications