+ implemented changes for target edit according to the 1 user feedback.