Adding hostname support + fix empty string bug