Adding a check that if values are present only then it should be updated on UI