fix listing and pagination