Small changes, mainly about pagination
I don't know apiary, so trying this out.