diff --git a/packages/merchant-backoffice-ui/src/InstanceRoutes.tsx b/packages/merchant-backoffice-ui/src/InstanceRoutes.tsx
index aae61bfc3..d5f56ccb3 100644
--- a/packages/merchant-backoffice-ui/src/InstanceRoutes.tsx
+++ b/packages/merchant-backoffice-ui/src/InstanceRoutes.tsx
@@ -169,7 +169,7 @@ export function InstanceRoutes({
       if (error.type === ErrorType.TIMEOUT) {
         setGlobalNotification({
           message: i18n.str`The request to the backend take too long and was cancelled`,
-          description: i18n.str`Diagnostic from ${error.info?.url} is '${error.message}'`,
+          description: i18n.str`Diagnostic from ${error.info?.url} is "${error.message}"`,
           type: "ERROR",
           to,
         });
diff --git a/packages/merchant-backoffice-ui/src/i18n/taler-merchant-backoffice.pot b/packages/merchant-backoffice-ui/src/i18n/taler-merchant-backoffice.pot
index cdc469328..08b6208c9 100644
--- a/packages/merchant-backoffice-ui/src/i18n/taler-merchant-backoffice.pot
+++ b/packages/merchant-backoffice-ui/src/i18n/taler-merchant-backoffice.pot
@@ -25,122 +25,127 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/components/modal/index.tsx:69
+#: src/components/modal/index.tsx:71
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#: src/components/modal/index.tsx:76
+#: src/components/modal/index.tsx:79
 #, c-format
 msgid "%1$s"
 msgstr ""
 
-#: src/components/modal/index.tsx:115
+#: src/components/modal/index.tsx:84
+#, c-format
+msgid "Close"
+msgstr ""
+
+#: src/components/modal/index.tsx:124
 #, c-format
 msgid "Continue"
 msgstr ""
 
-#: src/components/modal/index.tsx:169
+#: src/components/modal/index.tsx:178
 #, c-format
 msgid "Clear"
 msgstr ""
 
-#: src/components/modal/index.tsx:181
+#: src/components/modal/index.tsx:190
 #, c-format
 msgid "Confirm"
 msgstr ""
 
-#: src/components/modal/index.tsx:287
+#: src/components/modal/index.tsx:296
 #, c-format
 msgid "is not the same as the current access token"
 msgstr ""
 
-#: src/components/modal/index.tsx:290
+#: src/components/modal/index.tsx:299
 #, c-format
 msgid "cannot be empty"
 msgstr ""
 
-#: src/components/modal/index.tsx:292
+#: src/components/modal/index.tsx:301
 #, c-format
 msgid "cannot be the same as the old token"
 msgstr ""
 
-#: src/components/modal/index.tsx:296
+#: src/components/modal/index.tsx:305
 #, c-format
 msgid "is not the same"
 msgstr ""
 
-#: src/components/modal/index.tsx:306
+#: src/components/modal/index.tsx:315
 #, c-format
 msgid "You are updating the access token from instance with id %1$s"
 msgstr ""
 
-#: src/components/modal/index.tsx:322
+#: src/components/modal/index.tsx:331
 #, c-format
 msgid "Old access token"
 msgstr ""
 
-#: src/components/modal/index.tsx:323
+#: src/components/modal/index.tsx:332
 #, c-format
 msgid "access token currently in use"
 msgstr ""
 
-#: src/components/modal/index.tsx:329
+#: src/components/modal/index.tsx:338
 #, c-format
 msgid "New access token"
 msgstr ""
 
-#: src/components/modal/index.tsx:330
+#: src/components/modal/index.tsx:339
 #, c-format
 msgid "next access token to be used"
 msgstr ""
 
-#: src/components/modal/index.tsx:335
+#: src/components/modal/index.tsx:344
 #, c-format
 msgid "Repeat access token"
 msgstr ""
 
-#: src/components/modal/index.tsx:336
+#: src/components/modal/index.tsx:345
 #, c-format
 msgid "confirm the same access token"
 msgstr ""
 
-#: src/components/modal/index.tsx:341
+#: src/components/modal/index.tsx:350
 #, c-format
 msgid "Clearing the access token will mean public access to the instance"
 msgstr ""
 
-#: src/components/modal/index.tsx:368
+#: src/components/modal/index.tsx:377
 #, c-format
 msgid "cannot be the same as the old access token"
 msgstr ""
 
-#: src/components/modal/index.tsx:385
+#: src/components/modal/index.tsx:394
 #, c-format
 msgid "You are setting the access token for the new instance"
 msgstr ""
 
-#: src/components/modal/index.tsx:411
+#: src/components/modal/index.tsx:420
 #, c-format
 msgid "With external authorization method no check will be done by the merchant backend"
 msgstr ""
 
-#: src/components/modal/index.tsx:427
+#: src/components/modal/index.tsx:436
 #, c-format
 msgid "Set external authorization"
 msgstr ""
 
-#: src/components/modal/index.tsx:439
+#: src/components/modal/index.tsx:448
 #, c-format
 msgid "Set access token"
 msgstr ""
 
-#: src/components/modal/index.tsx:461
+#: src/components/modal/index.tsx:470
 #, c-format
 msgid "Operation in progress..."
 msgstr ""
 
-#: src/components/modal/index.tsx:470
+#: src/components/modal/index.tsx:479
 #, c-format
 msgid "The operation will be automatically canceled after %1$s seconds"
 msgstr ""
@@ -185,52 +190,52 @@ msgstr ""
 msgid "There is no instances yet, add more pressing the + sign"
 msgstr ""
 
-#: src/paths/admin/list/View.tsx:69
+#: src/paths/admin/list/View.tsx:68
 #, c-format
 msgid "Only show active instances"
 msgstr ""
 
-#: src/paths/admin/list/View.tsx:72
+#: src/paths/admin/list/View.tsx:71
 #, c-format
 msgid "Active"
 msgstr ""
 
-#: src/paths/admin/list/View.tsx:79
+#: src/paths/admin/list/View.tsx:78
 #, c-format
 msgid "Only show deleted instances"
 msgstr ""
 
-#: src/paths/admin/list/View.tsx:82
+#: src/paths/admin/list/View.tsx:81
 #, c-format
 msgid "Deleted"
 msgstr ""
 
-#: src/paths/admin/list/View.tsx:89
+#: src/paths/admin/list/View.tsx:88
 #, c-format
 msgid "Show all instances"
 msgstr ""
 
-#: src/paths/admin/list/View.tsx:92
+#: src/paths/admin/list/View.tsx:91
 #, c-format
 msgid "All"
 msgstr ""
 
-#: src/paths/admin/list/index.tsx:89
+#: src/paths/admin/list/index.tsx:101
 #, c-format
 msgid "Instance '%1$s' (ID: %2$s) has been deleted"
 msgstr ""
 
-#: src/paths/admin/list/index.tsx:94
+#: src/paths/admin/list/index.tsx:106
 #, c-format
 msgid "Failed to delete instance"
 msgstr ""
 
-#: src/paths/admin/list/index.tsx:112
+#: src/paths/admin/list/index.tsx:124
 #, c-format
 msgid "Instance '%1$s' (ID: %2$s) has been disabled"
 msgstr ""
 
-#: src/paths/admin/list/index.tsx:117
+#: src/paths/admin/list/index.tsx:129
 #, c-format
 msgid "Failed to purge instance"
 msgstr ""
@@ -534,266 +539,271 @@ msgstr ""
 msgid "total price"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:149
+#: src/paths/instance/orders/create/CreatePage.tsx:153
 #, c-format
 msgid "required"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:153
+#: src/paths/instance/orders/create/CreatePage.tsx:157
+#, c-format
+msgid "not valid"
+msgstr ""
+
+#: src/paths/instance/orders/create/CreatePage.tsx:159
 #, c-format
 msgid "must be greater than 0"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:158
+#: src/paths/instance/orders/create/CreatePage.tsx:164
 #, c-format
 msgid "not a valid json"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:164
+#: src/paths/instance/orders/create/CreatePage.tsx:170
 #, c-format
 msgid "should be in the future"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:167
+#: src/paths/instance/orders/create/CreatePage.tsx:173
 #, c-format
 msgid "refund deadline cannot be before pay deadline"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:173
+#: src/paths/instance/orders/create/CreatePage.tsx:179
 #, c-format
 msgid "wire transfer deadline cannot be before refund deadline"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:184
+#: src/paths/instance/orders/create/CreatePage.tsx:190
 #, c-format
 msgid "wire transfer deadline cannot be before pay deadline"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:191
+#: src/paths/instance/orders/create/CreatePage.tsx:197
 #, c-format
 msgid "should have a refund deadline"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:196
+#: src/paths/instance/orders/create/CreatePage.tsx:202
 #, c-format
 msgid "auto refund cannot be after refund deadline"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:354
+#: src/paths/instance/orders/create/CreatePage.tsx:360
 #, c-format
 msgid "Manage products in order"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:363
+#: src/paths/instance/orders/create/CreatePage.tsx:369
 #, c-format
 msgid "Manage list of products in the order."
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:385
+#: src/paths/instance/orders/create/CreatePage.tsx:391
 #, c-format
 msgid "Remove this product from the order."
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:409
+#: src/paths/instance/orders/create/CreatePage.tsx:415
 #, c-format
 msgid "Total price"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:411
+#: src/paths/instance/orders/create/CreatePage.tsx:417
 #, c-format
 msgid "total product price added up"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:424
+#: src/paths/instance/orders/create/CreatePage.tsx:430
 #, c-format
 msgid "Amount to be paid by the customer"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:430
+#: src/paths/instance/orders/create/CreatePage.tsx:436
 #, c-format
 msgid "Order price"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:431
+#: src/paths/instance/orders/create/CreatePage.tsx:437
 #, c-format
 msgid "final order price"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:438
+#: src/paths/instance/orders/create/CreatePage.tsx:444
 #, c-format
 msgid "Summary"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:439
+#: src/paths/instance/orders/create/CreatePage.tsx:445
 #, c-format
 msgid "Title of the order to be shown to the customer"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:444
+#: src/paths/instance/orders/create/CreatePage.tsx:450
 #, c-format
 msgid "Shipping and Fulfillment"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:449
+#: src/paths/instance/orders/create/CreatePage.tsx:455
 #, c-format
 msgid "Delivery date"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:450
+#: src/paths/instance/orders/create/CreatePage.tsx:456
 #, c-format
 msgid "Deadline for physical delivery assured by the merchant."
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:455
+#: src/paths/instance/orders/create/CreatePage.tsx:461
 #, c-format
 msgid "Location"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:456
+#: src/paths/instance/orders/create/CreatePage.tsx:462
 #, c-format
 msgid "address where the products will be delivered"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:463
+#: src/paths/instance/orders/create/CreatePage.tsx:469
 #, c-format
 msgid "Fulfillment URL"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:464
+#: src/paths/instance/orders/create/CreatePage.tsx:470
 #, c-format
 msgid "URL to which the user will be redirected after successful payment."
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:470
+#: src/paths/instance/orders/create/CreatePage.tsx:476
 #, c-format
 msgid "Taler payment options"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:471
+#: src/paths/instance/orders/create/CreatePage.tsx:477
 #, c-format
 msgid "Override default Taler payment settings for this order"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:475
+#: src/paths/instance/orders/create/CreatePage.tsx:481
 #, c-format
 msgid "Payment deadline"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:476
+#: src/paths/instance/orders/create/CreatePage.tsx:482
 #, c-format
 msgid ""
 "Deadline for the customer to pay for the offer before it expires. Inventory "
 "products will be reserved until this deadline."
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:480
+#: src/paths/instance/orders/create/CreatePage.tsx:486
 #, c-format
 msgid "Refund deadline"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:481
+#: src/paths/instance/orders/create/CreatePage.tsx:487
 #, c-format
 msgid "Time until which the order can be refunded by the merchant."
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:485
+#: src/paths/instance/orders/create/CreatePage.tsx:491
 #, c-format
 msgid "Wire transfer deadline"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:486
+#: src/paths/instance/orders/create/CreatePage.tsx:492
 #, c-format
 msgid "Deadline for the exchange to make the wire transfer."
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:490
+#: src/paths/instance/orders/create/CreatePage.tsx:496
 #, c-format
 msgid "Auto-refund deadline"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:491
+#: src/paths/instance/orders/create/CreatePage.tsx:497
 #, c-format
 msgid ""
 "Time until which the wallet will automatically check for refunds without user "
 "interaction."
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:496
+#: src/paths/instance/orders/create/CreatePage.tsx:502
 #, c-format
 msgid "Maximum deposit fee"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:497
+#: src/paths/instance/orders/create/CreatePage.tsx:503
 #, c-format
 msgid ""
 "Maximum deposit fees the merchant is willing to cover for this order. Higher "
 "deposit fees must be covered in full by the consumer."
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:501
+#: src/paths/instance/orders/create/CreatePage.tsx:507
 #, c-format
 msgid "Maximum wire fee"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:502
+#: src/paths/instance/orders/create/CreatePage.tsx:508
 #, c-format
 msgid ""
 "Maximum aggregate wire fees the merchant is willing to cover for this order. "
 "Wire fees exceeding this amount are to be covered by the customers."
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:506
+#: src/paths/instance/orders/create/CreatePage.tsx:512
 #, c-format
 msgid "Wire fee amortization"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:507
+#: src/paths/instance/orders/create/CreatePage.tsx:513
 #, c-format
 msgid ""
 "Factor by which wire fees exceeding the above threshold are divided to determine "
 "the share of excess wire fees to be paid explicitly by the consumer."
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:511
+#: src/paths/instance/orders/create/CreatePage.tsx:517
 #, c-format
 msgid "Create token"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:512
+#: src/paths/instance/orders/create/CreatePage.tsx:518
 #, c-format
 msgid ""
 "Uncheck this option if the merchant backend generated an order ID with enough "
 "entropy to prevent adversarial claims."
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:516
+#: src/paths/instance/orders/create/CreatePage.tsx:522
 #, c-format
 msgid "Minimum age required"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:517
+#: src/paths/instance/orders/create/CreatePage.tsx:523
 #, c-format
 msgid ""
 "Any value greater than 0 will limit the coins able be used to pay this contract. "
 "If empty the age restriction will be defined by the products"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:520
+#: src/paths/instance/orders/create/CreatePage.tsx:526
 #, c-format
 msgid "Min age defined by the producs is %1$s"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:528
+#: src/paths/instance/orders/create/CreatePage.tsx:534
 #, c-format
 msgid "Additional information"
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:529
+#: src/paths/instance/orders/create/CreatePage.tsx:535
 #, c-format
 msgid "Custom information to be included in the contract for this order."
 msgstr ""
 
-#: src/paths/instance/orders/create/CreatePage.tsx:535
+#: src/paths/instance/orders/create/CreatePage.tsx:541
 #, c-format
 msgid "You must enter a value in JavaScript Object Notation (JSON)."
 msgstr ""
@@ -1185,12 +1195,12 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: src/paths/instance/orders/details/index.tsx:67
+#: src/paths/instance/orders/details/index.tsx:79
 #, c-format
 msgid "refund created successfully"
 msgstr ""
 
-#: src/paths/instance/orders/details/index.tsx:73
+#: src/paths/instance/orders/details/index.tsx:85
 #, c-format
 msgid "could not create the refund"
 msgstr ""
@@ -1257,17 +1267,17 @@ msgstr ""
 msgid "date (YYYY/MM/DD)"
 msgstr ""
 
-#: src/paths/instance/orders/list/index.tsx:91
+#: src/paths/instance/orders/list/index.tsx:103
 #, c-format
 msgid "Enter an order id"
 msgstr ""
 
-#: src/paths/instance/orders/list/index.tsx:99
+#: src/paths/instance/orders/list/index.tsx:111
 #, c-format
 msgid "order not found"
 msgstr ""
 
-#: src/paths/instance/orders/list/index.tsx:166
+#: src/paths/instance/orders/list/index.tsx:178
 #, c-format
 msgid "could not get the order to refund"
 msgstr ""
@@ -1486,22 +1496,22 @@ msgstr ""
 msgid "There is no products yet, add more pressing the + sign"
 msgstr ""
 
-#: src/paths/instance/products/list/index.tsx:74
+#: src/paths/instance/products/list/index.tsx:86
 #, c-format
 msgid "product updated successfully"
 msgstr ""
 
-#: src/paths/instance/products/list/index.tsx:80
+#: src/paths/instance/products/list/index.tsx:92
 #, c-format
 msgid "could not update the product"
 msgstr ""
 
-#: src/paths/instance/products/list/index.tsx:91
+#: src/paths/instance/products/list/index.tsx:103
 #, c-format
 msgid "product delete successfully"
 msgstr ""
 
-#: src/paths/instance/products/list/index.tsx:97
+#: src/paths/instance/products/list/index.tsx:109
 #, c-format
 msgid "could not delete the product"
 msgstr ""
@@ -1704,164 +1714,276 @@ msgstr ""
 msgid "Expected Balance"
 msgstr ""
 
-#: src/paths/instance/reserves/list/index.tsx:98
+#: src/paths/instance/reserves/list/index.tsx:110
 #, c-format
 msgid "could not create the tip"
 msgstr ""
 
-#: src/paths/instance/templates/create/CreatePage.tsx:60
+#: src/paths/instance/templates/create/CreatePage.tsx:77
 #, c-format
 msgid "should not be empty"
 msgstr ""
 
-#: src/paths/instance/templates/create/CreatePage.tsx:69
+#: src/paths/instance/templates/create/CreatePage.tsx:93
 #, c-format
 msgid "should be greater that 0"
 msgstr ""
 
-#: src/paths/instance/templates/create/CreatePage.tsx:72
+#: src/paths/instance/templates/create/CreatePage.tsx:96
 #, c-format
 msgid "can't be empty"
 msgstr ""
 
-#: src/paths/instance/templates/create/CreatePage.tsx:76
+#: src/paths/instance/templates/create/CreatePage.tsx:100
 #, c-format
 msgid "to short"
 msgstr ""
 
-#: src/paths/instance/templates/create/CreatePage.tsx:104
+#: src/paths/instance/templates/create/CreatePage.tsx:108
+#, c-format
+msgid "just letters and numbers from 2 to 7"
+msgstr ""
+
+#: src/paths/instance/templates/create/CreatePage.tsx:110
+#, c-format
+msgid "size of the key should be 32"
+msgstr ""
+
+#: src/paths/instance/templates/create/CreatePage.tsx:137
 #, c-format
 msgid "Identifier"
 msgstr ""
 
-#: src/paths/instance/templates/create/CreatePage.tsx:105
+#: src/paths/instance/templates/create/CreatePage.tsx:138
 #, c-format
 msgid "Name of the template in URLs."
 msgstr ""
 
-#: src/paths/instance/templates/create/CreatePage.tsx:112
+#: src/paths/instance/templates/create/CreatePage.tsx:144
 #, c-format
 msgid "Describe what this template stands for"
 msgstr ""
 
-#: src/paths/instance/templates/create/CreatePage.tsx:117
+#: src/paths/instance/templates/create/CreatePage.tsx:149
 #, c-format
-msgid "Order summary"
+msgid "Fixed summary"
 msgstr ""
 
-#: src/paths/instance/templates/create/CreatePage.tsx:127
+#: src/paths/instance/templates/create/CreatePage.tsx:150
+#, c-format
+msgid "If specified, this template will create order with the same summary"
+msgstr ""
+
+#: src/paths/instance/templates/create/CreatePage.tsx:154
+#, c-format
+msgid "Fixed price"
+msgstr ""
+
+#: src/paths/instance/templates/create/CreatePage.tsx:155
+#, c-format
+msgid "If specified, this template will create order with the same price"
+msgstr ""
+
+#: src/paths/instance/templates/create/CreatePage.tsx:159
 #, c-format
 msgid "Minimum age"
 msgstr ""
 
-#: src/paths/instance/templates/create/CreatePage.tsx:129
+#: src/paths/instance/templates/create/CreatePage.tsx:161
 #, c-format
 msgid "Is this contract restricted to some age?"
 msgstr ""
 
-#: src/paths/instance/templates/create/CreatePage.tsx:133
+#: src/paths/instance/templates/create/CreatePage.tsx:165
 #, c-format
 msgid "Payment timeout"
 msgstr ""
 
-#: src/paths/instance/templates/create/CreatePage.tsx:135
+#: src/paths/instance/templates/create/CreatePage.tsx:167
 #, c-format
 msgid ""
 "How much time has the customer to complete the payment once the order was "
 "created."
 msgstr ""
 
-#: src/paths/instance/templates/create/CreatePage.tsx:139
+#: src/paths/instance/templates/create/CreatePage.tsx:171
+#, c-format
+msgid "Verification algorithm"
+msgstr ""
+
+#: src/paths/instance/templates/create/CreatePage.tsx:172
+#, c-format
+msgid "Algorithm to use to verify transaction in offline mode"
+msgstr ""
+
+#: src/paths/instance/templates/create/CreatePage.tsx:180
 #, c-format
 msgid "Point-of-sale key"
 msgstr ""
 
-#: src/paths/instance/templates/create/CreatePage.tsx:141
+#: src/paths/instance/templates/create/CreatePage.tsx:182
 #, c-format
 msgid "Useful to validate the purchase"
 msgstr ""
 
+#: src/paths/instance/templates/create/CreatePage.tsx:196
+#, c-format
+msgid "generate random secret key"
+msgstr ""
+
+#: src/paths/instance/templates/create/CreatePage.tsx:203
+#, c-format
+msgid "random"
+msgstr ""
+
+#: src/paths/instance/templates/create/CreatePage.tsx:208
+#, c-format
+msgid "show secret key"
+msgstr ""
+
+#: src/paths/instance/templates/create/CreatePage.tsx:209
+#, c-format
+msgid "hide secret key"
+msgstr ""
+
+#: src/paths/instance/templates/create/CreatePage.tsx:216
+#, c-format
+msgid "hide"
+msgstr ""
+
+#: src/paths/instance/templates/create/CreatePage.tsx:218
+#, c-format
+msgid "show"
+msgstr ""
+
 #: src/paths/instance/templates/create/index.tsx:52
 #, c-format
 msgid "could not inform template"
 msgstr ""
 
-#: src/paths/instance/templates/use/UsePage.tsx:53
+#: src/paths/instance/templates/use/UsePage.tsx:54
 #, c-format
 msgid "Amount is required"
 msgstr ""
 
-#: src/paths/instance/templates/use/UsePage.tsx:57
+#: src/paths/instance/templates/use/UsePage.tsx:58
 #, c-format
 msgid "Order summary is required"
 msgstr ""
 
-#: src/paths/instance/templates/use/UsePage.tsx:91
+#: src/paths/instance/templates/use/UsePage.tsx:86
+#, c-format
+msgid "New order for template"
+msgstr ""
+
+#: src/paths/instance/templates/use/UsePage.tsx:108
 #, c-format
 msgid "Amount of the order"
 msgstr ""
 
-#: src/paths/instance/templates/use/index.tsx:79
+#: src/paths/instance/templates/use/UsePage.tsx:113
+#, c-format
+msgid "Order summary"
+msgstr ""
+
+#: src/paths/instance/templates/use/index.tsx:92
 #, c-format
 msgid "could not create order from template"
 msgstr ""
 
-#: src/paths/instance/templates/list/Table.tsx:63
+#: src/paths/instance/templates/qr/QrPage.tsx:131
+#, c-format
+msgid ""
+"Here you can specify a default value for fields that are not fixed. Default "
+"values can be edited by the customer before the payment."
+msgstr ""
+
+#: src/paths/instance/templates/qr/QrPage.tsx:148
+#, c-format
+msgid "Fixed amount"
+msgstr ""
+
+#: src/paths/instance/templates/qr/QrPage.tsx:149
+#, c-format
+msgid "Default amount"
+msgstr ""
+
+#: src/paths/instance/templates/qr/QrPage.tsx:161
+#, c-format
+msgid "Default summary"
+msgstr ""
+
+#: src/paths/instance/templates/qr/QrPage.tsx:177
+#, c-format
+msgid "Print"
+msgstr ""
+
+#: src/paths/instance/templates/qr/QrPage.tsx:184
+#, c-format
+msgid "Setup TOTP"
+msgstr ""
+
+#: src/paths/instance/templates/list/Table.tsx:65
 #, c-format
 msgid "Templates"
 msgstr ""
 
-#: src/paths/instance/templates/list/Table.tsx:68
+#: src/paths/instance/templates/list/Table.tsx:70
 #, c-format
 msgid "add new templates"
 msgstr ""
 
-#: src/paths/instance/templates/list/Table.tsx:137
+#: src/paths/instance/templates/list/Table.tsx:142
 #, c-format
 msgid "load more templates before the first one"
 msgstr ""
 
-#: src/paths/instance/templates/list/Table.tsx:141
+#: src/paths/instance/templates/list/Table.tsx:146
 #, c-format
 msgid "load newer templates"
 msgstr ""
 
-#: src/paths/instance/templates/list/Table.tsx:176
+#: src/paths/instance/templates/list/Table.tsx:181
 #, c-format
 msgid "delete selected templates from the database"
 msgstr ""
 
-#: src/paths/instance/templates/list/Table.tsx:183
+#: src/paths/instance/templates/list/Table.tsx:188
 #, c-format
 msgid "use template to create new order"
 msgstr ""
 
-#: src/paths/instance/templates/list/Table.tsx:198
+#: src/paths/instance/templates/list/Table.tsx:195
+#, c-format
+msgid "create qr code for the template"
+msgstr ""
+
+#: src/paths/instance/templates/list/Table.tsx:210
 #, c-format
 msgid "load more templates after the last one"
 msgstr ""
 
-#: src/paths/instance/templates/list/Table.tsx:202
+#: src/paths/instance/templates/list/Table.tsx:214
 #, c-format
 msgid "load older templates"
 msgstr ""
 
-#: src/paths/instance/templates/list/Table.tsx:219
+#: src/paths/instance/templates/list/Table.tsx:231
 #, c-format
 msgid "There is no templates yet, add more pressing the + sign"
 msgstr ""
 
-#: src/paths/instance/templates/list/index.tsx:87
+#: src/paths/instance/templates/list/index.tsx:104
 #, c-format
 msgid "template delete successfully"
 msgstr ""
 
-#: src/paths/instance/templates/list/index.tsx:93
+#: src/paths/instance/templates/list/index.tsx:110
 #, c-format
 msgid "could not delete the template"
 msgstr ""
 
-#: src/paths/instance/templates/update/index.tsx:78
+#: src/paths/instance/templates/update/index.tsx:90
 #, c-format
 msgid "could not update template"
 msgstr ""
@@ -1971,12 +2093,12 @@ msgstr ""
 msgid "There is no webhooks yet, add more pressing the + sign"
 msgstr ""
 
-#: src/paths/instance/webhooks/list/index.tsx:82
+#: src/paths/instance/webhooks/list/index.tsx:94
 #, c-format
 msgid "webhook delete successfully"
 msgstr ""
 
-#: src/paths/instance/webhooks/list/index.tsx:88
+#: src/paths/instance/webhooks/list/index.tsx:100
 #, c-format
 msgid "could not delete the webhook"
 msgstr ""
@@ -2427,67 +2549,72 @@ msgstr ""
 msgid "Manage access token"
 msgstr ""
 
-#: src/paths/instance/update/index.tsx:100
+#: src/paths/instance/update/index.tsx:112
 #, c-format
 msgid "Failed to create instance"
 msgstr ""
 
-#: src/components/exception/login.tsx:64
+#: src/components/exception/login.tsx:74
 #, c-format
 msgid "Login required"
 msgstr ""
 
-#: src/components/exception/login.tsx:70
+#: src/components/exception/login.tsx:80
 #, c-format
 msgid "Please enter your access token."
 msgstr ""
 
-#: src/components/exception/login.tsx:98
+#: src/components/exception/login.tsx:108
 #, c-format
 msgid "Access Token"
 msgstr ""
 
-#: src/InstanceRoutes.tsx:169
+#: src/InstanceRoutes.tsx:171
 #, c-format
 msgid "The request to the backend take too long and was cancelled"
 msgstr ""
 
-#: src/InstanceRoutes.tsx:170
+#: src/InstanceRoutes.tsx:172
 #, c-format
-msgid "Diagnostic from %1$s is '%2$s'"
+msgid "Diagnostic from %1$s is \\"%2$s\\""
 msgstr ""
 
-#: src/InstanceRoutes.tsx:176
+#: src/InstanceRoutes.tsx:178
 #, c-format
 msgid "The backend reported a problem: HTTP status #%1$s"
 msgstr ""
 
-#: src/InstanceRoutes.tsx:194
+#: src/InstanceRoutes.tsx:179
+#, c-format
+msgid "Diagnostic from %1$s is '%2$s'"
+msgstr ""
+
+#: src/InstanceRoutes.tsx:196
 #, c-format
 msgid "Access denied"
 msgstr ""
 
-#: src/InstanceRoutes.tsx:195
+#: src/InstanceRoutes.tsx:197
 #, c-format
 msgid "The access token provided is invalid."
 msgstr ""
 
-#: src/InstanceRoutes.tsx:210
+#: src/InstanceRoutes.tsx:212
 #, c-format
 msgid "No 'default' instance configured yet."
 msgstr ""
 
-#: src/InstanceRoutes.tsx:211
+#: src/InstanceRoutes.tsx:213
 #, c-format
 msgid "Create a 'default' instance to begin using the merchant backoffice."
 msgstr ""
 
-#: src/InstanceRoutes.tsx:614
+#: src/InstanceRoutes.tsx:630
 #, c-format
 msgid "The access token provided is invalid"
 msgstr ""
 
-#: src/InstanceRoutes.tsx:648
+#: src/InstanceRoutes.tsx:664
 #, c-format
 msgid "Hide for today"
 msgstr ""
@@ -2522,37 +2649,42 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: src/ApplicationReadyRoutes.tsx:58
+#: src/ApplicationReadyRoutes.tsx:71
 #, c-format
 msgid "Check your token is valid"
 msgstr ""
 
-#: src/ApplicationReadyRoutes.tsx:84
+#: src/ApplicationReadyRoutes.tsx:90
 #, c-format
 msgid "Couldn't access the server."
 msgstr ""
 
-#: src/ApplicationReadyRoutes.tsx:85
+#: src/ApplicationReadyRoutes.tsx:91
 #, c-format
 msgid "Could not infer instance id from url %1$s"
 msgstr ""
 
-#: src/Application.tsx:94
+#: src/Application.tsx:104
 #, c-format
 msgid "Server not found"
 msgstr ""
 
-#: src/Application.tsx:109
+#: src/Application.tsx:118
 #, c-format
-msgid "Couldn't access the server"
+msgid "Server response with an error code"
 msgstr ""
 
-#: src/Application.tsx:111
+#: src/Application.tsx:120
 #, c-format
 msgid "Got message %1$s from %2$s"
 msgstr ""
 
-#: src/Application.tsx:126
+#: src/Application.tsx:131
+#, c-format
+msgid "Response from server is unreadable, http status: %1$s"
+msgstr ""
+
+#: src/Application.tsx:144
 #, c-format
 msgid "Unexpected Error"
 msgstr ""
diff --git a/packages/pogen/bin/pogen b/packages/pogen/bin/pogen
index a7ef879d8..3b17d1df7 100755
--- a/packages/pogen/bin/pogen
+++ b/packages/pogen/bin/pogen
@@ -1,2 +1,2 @@
-#!/usr/bin/env node
+#!/usr/bin/env -S node --trace-deprecation
 require('../lib/pogen.js').main();
diff --git a/packages/pogen/example/proj1/package.json b/packages/pogen/example/proj1/package.json
index 954139ecf..97adf0f3a 100644
--- a/packages/pogen/example/proj1/package.json
+++ b/packages/pogen/example/proj1/package.json
@@ -7,5 +7,8 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",
-  "license": "ISC"
+  "license": "ISC",
+  "pogen": {
+    "domain": "test"
+  }
 }
diff --git a/packages/pogen/example/messages.po b/packages/pogen/example/proj1/src/i18n/test.pot
similarity index 58%
rename from packages/pogen/example/messages.po
rename to packages/pogen/example/proj1/src/i18n/test.pot
index 1addae3f2..8bc5ef236 100644
--- a/packages/pogen/example/messages.po
+++ b/packages/pogen/example/proj1/src/i18n/test.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-27 01:51+0100\n"
+"POT-Creation-Date: 2016-11-23 00:00+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,68 +17,78 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: example/test.ts:3
-#, csharp-format
+#: src/test.ts:4
+#, c-format
 msgid "Hello1, World"
 msgstr ""
 
-#: example/test.ts:4
-#, csharp-format
-msgid "Hello2, World"
+#: src/test.ts:8
+#, c-format
+msgid "Hello, quoted \"world\""
 msgstr ""
 
-#: example/test.ts:5
-#, csharp-format
-msgid "Hello3, World"
-msgstr ""
-
-#. This is a comment and should be included 
-#: example/test.ts:9
-#, csharp-format
-msgid "Hello4, World"
-msgstr ""
-
-#: example/test.ts:12
-#, csharp-format
+#: src/test.ts:15
+#, c-format
 msgid "Hello5, World"
 msgstr ""
 
-#: example/test.ts:13
-#, csharp-format
-msgid "Hello6,{0} World"
+#: src/test.ts:16
+#, c-format
+msgid "Hello6,%1$s World"
 msgstr ""
 
 #. This one has a multi line comment.
 #. It has multiple lines, and a trailing empty line.
 #. 
-#: example/test.ts:20
-#, csharp-format
-msgid "Hello7,{0} World{1}"
+#: src/test.ts:23
+#, c-format
+msgid "Hello7,%1$s World%2$s"
 msgstr ""
 
-#: example/test.ts:21
-#, csharp-format
-msgid "{0}Hello8,{1} World{2}"
+#: src/test.ts:23
+#, c-format
+msgid "one %1$s"
+msgid_plural "many %1$s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/test.ts:26
+#, c-format
+msgid "one bla %1$s"
+msgid_plural "many bla %1$s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/test.ts:31
+#, c-format
+msgid "I have %1$s apple"
+msgid_plural "I have %1$s apples"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/test.ts:35
+#, c-format
+msgid "%1$sHello8,%2$s World%3$s"
 msgstr ""
 
 #. 
 #. This one has a multi line comment.
 #. It has multiple lines, and a leading empty line.
-#: example/test.ts:28
-#, csharp-format
+#: src/test.ts:42
+#, c-format
 msgid "Hello9,\" '\" World"
 msgstr ""
 
-#: example/test.ts:32
-#, csharp-format
+#: src/test.ts:46
+#, c-format
 msgid ""
 "Hello10\n"
 "            ,\" '\" Wo\n"
 "            rld"
 msgstr ""
 
-#: example/test.ts:37
-#, csharp-format
+#: src/test.ts:51
+#, c-format
 msgid ""
 "Hello11 this is a long long string\n"
 "it will go over multiple lines and in the pofile\n"
@@ -86,8 +96,8 @@ msgid ""
 msgstr ""
 
 #. This is a single line comment
-#: example/test.ts:42
-#, csharp-format
+#: src/test.ts:56
+#, c-format
 msgid ""
 "Hello12 this is a long long string it will go over multiple lines and in the "
 "pofile it should be wrapped and stuff. asdf asdf asdf asdf asdf asdf asdf asdf "
@@ -95,13 +105,26 @@ msgid ""
 "asdf"
 msgstr ""
 
-#: example/test.ts:42
-#, csharp-format
+#. First occurrence
+#: src/test.ts:65
+#, c-format
 msgid "This message appears twice"
 msgstr ""
 
-#: example/test.ts:45
-#, csharp-format
-msgid "This message appears twice"
+#: src/test2.tsx:1
+#, c-format
+msgid "foo %1$s foo baz"
+msgstr ""
+
+#: src/test2.tsx:5
+#, c-format
+msgid "singular form second line"
+msgid_plural "plural form"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/test2.tsx:17
+#, c-format
+msgid "\"foo\""
 msgstr ""
 
diff --git a/packages/pogen/example/test.ts b/packages/pogen/example/proj1/src/test.ts
similarity index 97%
rename from packages/pogen/example/test.ts
rename to packages/pogen/example/proj1/src/test.ts
index 6577fa314..2e9b4cbdd 100644
--- a/packages/pogen/example/test.ts
+++ b/packages/pogen/example/proj1/src/test.ts
@@ -1,9 +1,12 @@
 declare var i18n: any;
 
+
 console.log(i18n`Hello1, World`);
 console.log(i18n.foo()`Hello2, World`);
 console.log(i18n.foo()`Hello3, World`);
 
+console.log(i18n`Hello, quoted "world"`);
+
 
 /* This is a comment and should be included */
 console.log(i18n().foo()`Hello4, World`);
diff --git a/packages/pogen/example/test2.tsx b/packages/pogen/example/proj1/src/test2.tsx
similarity index 86%
rename from packages/pogen/example/test2.tsx
rename to packages/pogen/example/proj1/src/test2.tsx
index 4133f86fb..1c1ab49f2 100644
--- a/packages/pogen/example/test2.tsx
+++ b/packages/pogen/example/proj1/src/test2.tsx
@@ -13,3 +13,5 @@ let y = (
     </i18n.TranslatePlural>
     </i18n.TranslateSwitch>
 );
+
+let z = <i18n.Translate>"foo"</i18n.Translate>;
diff --git a/packages/pogen/src/potextract.ts b/packages/pogen/src/potextract.ts
index e75c17d55..3e9a95ded 100644
--- a/packages/pogen/src/potextract.ts
+++ b/packages/pogen/src/potextract.ts
@@ -154,7 +154,7 @@ function processFile(
       path,
       line: lc.line,
       comment: getComment(tte),
-      template: getTemplate(tte.template).replace(/"/g, '\\"'),
+      template: getTemplate(tte.template),
     };
     return res;
   }
@@ -172,6 +172,8 @@ function processFile(
 
   function formatMsgLine(head: string, msg: string) {
     // Do escaping, wrap break at newlines
+    console.log("head", JSON.stringify(head));
+    console.log("msg", JSON.stringify(msg));
     let parts = msg
       .match(/(.*\n|.+$)/g)
       .map((x) => x.replace(/\n/g, "\\n").replace(/"/g, '\\"'))