minor cleanup of EntityView::selectTerms

Change-Id: I9bb25ebcfb4baf4db5be6b17239e039788f8f8c1
Merge "minor cleanup of EntityView::selectTerms"