Add hostname and sitename if set