Amended queries to filter on current day