Fixed KFSQA-594 issues. Should work now that we have updated the Object Sub Type Code.