Improved formula dynamic reference mapping and expression.