Appllied Amit's changes with Add targeting and fixed bugs in target target value services