Resolve value == false issue
Improve unset logic