clean up the whole check match for >6hrs & >24hrs flow