Fix spelling and add template tag