Fixed bug in 'add'
Fixed bug in 'remove'
Fixed bug in 'update'
Merge branch 'work' into facelets