Change to less server specific URI handling