NSM-66 filter by year range initial impl is complete but it need some refactor cleanup