Replace 'is' check with '==' to make data queries more robust.