BS-2077
Do not remove variable type expression based on pageflow variable