Updated template bugs on listing pages