Listing grid fixes