adding pagination, sorting, fixing secret problem