Fix varname collision
Merge branch 'extended-orderby' into vlak
UPDATE queries do not generate a insert ID.