got pagination working, fixed subscription bug