migrate to querying on command tags