Fixing term pairs crud

Fixes tasks raised in this PT story: https://www.pivotaltracker.com/story/show/69093684