[TASK] Old URL pattern is no more supported

Related code cleaned
[BUGFIX] Trick to avoid a lot of IllegalStateException