Work on saving
Fix typecast error in controller
Merge branch 'hotfix/controller-typecast-error'