some filter improvements
Variableshandling improved