Changes to support rendering in the UI labels only - id values are preserved to perform the search query