Refactor current term method to use scope
Update calls to current term