some fixes for null attribute values