Fixing issue with false-positive matches on unsafe data bucket usage.
Jira Job LON-1272