final rewrites of the upstream-db plugin