WiP: Adding terms to provider (bug 932581)

https://bugzilla.mozilla.org/show_bug.cgi?id=932581