Updated the escape filter to utilise the new AbstractVariableFilter class