rearrange routes to be a bit cleaner
make the url route check a little more accurate