[deepak] fixed data format and introduced grouping in the view