The ? in the url pattern is a separator, so you don't need to regex more...
Merging with master branch