Fixed bugs for view/edit issue: autocomplete and active labels
Fixed conflicts: Label Repository