1. bug fix
2. add "dependencies" for fields