Bugfix introduced by previous refactor. Date range fields could not be resolved.