Fixing bug at listing pages