Query checks for forbidden and not supported keywords.
small updates on FORBIDDEN and NOT_SUPPORTED
Merge remote-tracking branch 'origin/tap-app' into work
Merge remote-tracking branch 'origin/work' into tap-app
Merge remote-tracking branch 'origin/tap-app' into work