JBIDE-18043 VPE: Fixing # for 'refresh-on-safe' option. Refactoring