Refactor terms subrecord to use the subrecord.js instead of its own special behaviour