bug fix pagination
bug fix front end
bug fix