Don't filter on token in scan_for_outputs
This allows us to handle unexpected token output missing better. The token lookup is also slow -- so it's better to filter as late as possible.
Additionally, for token.* queries, token lookup was done two times, first to filter, then to get token information. This removes the redundant lookup.