Bugfixes of preview map