Fix synchronization + better pagination