Update EosQueryParser for new api and server, misc cleanup