Fix bug + Client Side

- server side checking bug fixed
- server side validation improved a lot