fixes to content importing and swap