ECMS-6444 : fix excerpt problem + fix eviction problem