Fix in update and delete
Fix primitives
Support conditions in scan
Merge branch 'development'