merge with pagination fix and listing fix