pagination and authorization fixed