Rather than Last 30 days or Last 7 days, could the selection be This calendar month or This calendar week. Start and finish days may also need to be selected.