fix issues for bug fix 3.

Fixed following issues.
https://github.com/cloudspokes/arena-web/issues/258
https://github.com/cloudspokes/arena-web/issues/230
https://github.com/cloudspokes/arena-web/issues/212