Bugfix + make fiscal code unique (if available)