Close the feature info dialog on save
Fixed two cases that caused the AOI to get messed up.