Added special handling for attributes with a value of true or false