Adding With and Without filters to queries.  Tests are a bit odd currently as Date range functions are integrated yet