UPGRADE: paks
DEV: Improve host name matching with trailing wild-cards.