Fix remove empty containers on database for Repeat