Add departement number in context
Take "name" into account for flat address building