Changed spring scope of some controllers