maapps - validation, view changes and messages update
fix merge conflict