Revert null defaults
Fixed CS in select_tree