fixed pagination inside indicator code