Fixed issue when using multiple listing pages