Added support for date ranges on FS