ReqIF export mapping for more than one object type

I am using Jama Connect for requirements management and want to import reqs from Jama in ReqIF format using Requirements Editor. I am having two issues:

1. The ReqIF file created from Jama holds a Set, Folders, Text Items, and System Requirements. When I import this ReqIF file to Requirements Editor, the hierarchy is preserved, but everything is imported as type = Functional. I can manually update the objects that should be imported as 'containers' to type = container, but is there a way to automate this on the ReqIF import?
2. When I export my updates from Requirements Editor, even if I have set individual types for each object, everything is added to the ReqIF as a 'folder'. This makes the ReqIF conversation/round trip impossible to bring updates back into Jama Connect.

Any assistance is greatly appreaciated!