Further improvements to survey tables