More consistent folder pagination etc