executor: Improvements to make manual tagging more usable

This is enough to allow forcing some jobs to run on a subset of a set of machines while other jobs can use the full set :)

Fixes: fa2a756f ("executor/MaRS: add support for manual tags")