TIMOB-14554 Check for flag set with and filter.
Merge pull request #4518 from BlainHamon/timob-14554

TIMOB-14554 Check for flag set with and filter.