adds clean uri support