better non-www support