Reworking highlight/select to be the id not the full entity