many fixes with pagination