remove trailing comma from query. jump to query token. Fixes #45.