Fixed order statements
Fix paginators