Bugfixs: Runtime property update fix and escaping issues fix