add customer ID fix depending on the context