This is because the 'onInsert' callback is used for both actions, yet yielded different results causing breakages Fixes #1281 Also improved code readability in some places