#SUP-3193

added entrySelector controller to replace ID with the corresponding label