Fixed few issues related to js error and DS issues