View update and execute refactoring

Last PR was merged too fast, so some bugs was merged.
Bugs corrected.
Execute refactored.
update method doc block