Fix: addAfterElement
[in progress] big data performance