Clean up work around for host name filtering