Changed constraints to use whitelist
Bugfix equals missing not