Fixed Customer epic task2 issues