small fixes, have but with pagination/