Fixed bug where the first row was being retrieved twice.
Fixed ordering of columns to be by ordinal position