Renamed xf:xform and xf:extract, fixed bug in xf:select