Fix bugs on update\create