Fix mis-shown Org Name in pills