Support Route Globbing, fix null params and little cleanup