Included firstDateOfWeek function: still not done
weekly filters are now fixed