better sitename handling