fixed parsing from query without join