Refactor Action, per new names.ActionTag changes...

... and to improve internal structure.
We should never be querying documents on part of an ID.

We should be querying against other attributes.