Put back filtering by host name