Major bug fix - contextual templates were'nt working due to the new pattern not being greedy when matching context name.