Scope option value uniqueness to type. refs #5630
Improve readability in FlexiRate calculator labels
fixes #5673