feat(database): move values to specific tables (closes #4525)