pagination search fix etc