fixed filter settings, fixed database bug, other small fixes
changed Databse to new structure