Fix the daterange filter in order to work with other filters too