ashwin /pooja | #2170 | 2171 | 2168 fixing bugs in datasender page