improve multi-term keys