Some comments added and now the popup will show label instead of id