Fixed templateview adding