Making keys match with config.
Making week filter work.