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