Resolved some bugs when editing an existing feature