db schema changed, filters redone and finished v2