Minor improvements for easier case_id extraction