update some validation logic
fix some label