Some layers reload bug fixes
reload data bugfixes