Merge "Refactor find and select dialogs"