Further improvements to our matching - stop trying to guess what

might be the username or hostname and just match the entire thing
no matter what it may be.