[TIMOB-15446] Updated the whitelist logic
[TIMOB-15446] Bug fix
Merge pull request #250 from bryan-m-hughes/timob-15446

[TIMOB-15446] Updated the whitelist logic