Added keepAllTags property