Updates and bugfixes for ContentQA on new schema