Added support for term reference / options buttons combinations.