Collection: Tables fixes