Handle optional tables correctly, tweak legends