Changed FETCH query handling, use strings instead of object builder