Fixes for mountain pagination