improve calculated question import