Fixed pagination and updated to new flair approach