Updates several building fire template results to account for more possible cases (tenses, forms)
Modifies the original template format to match the final