Model: fix "dirty" even more

Still needed to add special treatment of `false` value