Follow up to review for performance #5407
Merge pull request #5408 from openscholar/5407-review

Follow up to review for performance #5407