* make it easier to reference the original database in the format expression
* fix