week filter fix
merge