Added best_in_place for tag editing
Minor changes