Minor improvements
Jira: APPFM-3 APPFM-7
Merge pull request #7 from michelemorello/APPFM-7_APPFM-3

Minor improvements. Reload does not happen twice.