issue #20734: Add some biz logic checks and presentation tweaks.