Fixing grouping bug where item selection would not take you to the proper item.