bugfixes and usability improvements Refs #17080
Usability improvements Refs #17080