Added additional check to remove false positives when active indicator is set to 'Y'