Implement major updates:

o Return Scanner Name in metainfo
o Filter on Scanner Name
o Fix some query output bugs
o Allow for prepend to protocol names