corrected pagination, cleanup of HealthDeliveryActivity