fix modal changelist issue (be more aggressive)