Fix bug for last token in query