term ID search user story and tests
Merge remote-tracking branch 'origin/master'