Updated label changes to match in the sidebar with new logic
Fixed merge