Bug fixes in Find Text Dialog, minor clean up.