OPAL-1681: Filter variables