Adding condition in the service layer and renaming dict.
Adding condition in the service layer and renaming dict.

DataViva/dataviva-site,DataViva/dataviva-site,DataViva/dataviva-site,DataViva/dataviva-site