Bugfix: Correctly disable criteria if attribute types change