Moar query params

Better handling of path/query combos