FIX: replaced control template tags with 3.1 equivelants