Improve a bit
URI modified.
Early Return
Detach js part