updated comment field, id based comparison added, removed group by