datefilter refactored and location filter fixed
resolved conflicts