feat(database): move values to specific tables (refs #4525)
Merge pull request #1069 from Eric-Brison/3.3-E4525

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