improve validators in form