CONTENTBOX-544 & CONTENTBOX-502

Fixes related to content import/exports