SOAP-1291 Cancel button and content types in discovery dialog now work properly