Ending basic query implementation + fix bad parser edition