Make site import overwrite work correctly
Fix bug in ram layout store