NSM-66 refactored range validation to be shared between years and drainage and another other to come along.
NSM-66 cleaned up filtering to be called once for both ogc and param based.