extended import
migration fix, short and full subject names