partial fix
partial fix 2.0
upvotes - prepare database in live