fixed context determination and collection parsing for included collection data
fq class names are now allowed as type