Fixed host filtering so it does it behaves as documented. Several other fixed which I forgot, but I need to get this out to get on with it :)