Fixes for country pagination