Added config option to always present base term first