Issue #3: fixing search to consider cancel_date