diff --git a/__main__.py b/__main__.py
index da8b2496..ee4f5863 100644
--- a/__main__.py
+++ b/__main__.py
@@ -46,8 +46,7 @@ def parse_args(cmdln_args):
 def validate_project(platform, project, report_type):
     # Conditionally require --platform and --project
     # if --report-type is 'test-case-coverage'
-    # if report_type == 'test-case-coverage':
-    if report_type in ('test-case-coverage', 'milestones'):
+    if report_type in ('test-case-coverage', 'testrail-milestones'):
         if not project:
             print("--project is required for the report selected")
         if not platform:
@@ -75,7 +74,7 @@ def main():
         else:
             num_days = ''
         h.testrail_run_counts_update(args.project, num_days)
-    if args.report_type == 'milestones':
+    if args.report_type == 'testrail-milestones':
         h = TestRailClient()
         h.test_rail_milestones()
     if args.report_type == 'issue-regression':
diff --git a/testrail.py b/testrail.py
index 8b8421dc..44b46ea1 100644
--- a/testrail.py
+++ b/testrail.py
@@ -27,7 +27,6 @@ def __init__(self):
             self.client = APIClient(TESTRAIL_HOST)
             self.client.user = os.environ['TESTRAIL_USERNAME']
             self.client.password = os.environ['TESTRAIL_PASSWORD']
-
         except KeyError:
             print("ERROR: Missing testrail env var")
             sys.exit(1)
diff --git a/utils/constants.py b/utils/constants.py
index db8f4c25..c4392695 100644
--- a/utils/constants.py
+++ b/utils/constants.py
@@ -23,7 +23,7 @@
     'jira-qa-requests',
     'jira-qa-needed',
     'bugzilla-qe-verify',
-    'milestones'
+    'testrail-milestones'
 ]
 
 # JQL query All QA Requests since 2022 filter_id: 13856
diff --git a/utils/datetime_utils.py b/utils/datetime_utils.py
index 7c400a8e..995c29c8 100644
--- a/utils/datetime_utils.py
+++ b/utils/datetime_utils.py
@@ -15,11 +15,8 @@ def convert_datetime_to_epoch(str_date):
         return int(t)
 
     def convert_epoch_to_datetime(int_epoch_date):
-        if int_epoch_date == '' or int_epoch_date == 0 or int_epoch_date == 'NaN':  # noqa
-            return None
-        else:
-            ts = datetime.fromtimestamp(int_epoch_date)
-            return ts.strftime(format_date)
+        ts = datetime.fromtimestamp(int_epoch_date)
+        return ts.strftime(format_date)
 
     def convert_to_utc(datetime_str):
         """Convert datetime string with timezone offset to UTC."""