Refactors to get all terms, including empty