Library - pagination improving