Add green or red icons to display the matching state, Remove obsolete id's displayed in the UI.
Code cleanning.