OPAL-1681 filter variables improvements