Correctly updating command label on selection