Fixes subsequent filter issue

Part of OOIION-1510
Merge pull request #89 from Bobfrat/ooiion1510

Fixes subsequent filter issue