Use 'is', 'is not' instead of '==', '!='
Handle error from conflicting restrict mapping