Bugs fixed for listing 9 and above