Fixes subsequent filter issue

Part of OOIION-1510
Merge pull request #90 from Bobfrat/ooiion1510_r2

Fixes subsequent filter issue