close #14; use ba rather than query token