Craig - update to latest boomqueries