Fix finding the start and end of the current query. (#239)

Fix finding the start and end of the current query. (#239) #148