More terms router/controller changes