Changed topic back to id for grouping