Feature/highlight expired batch