Up priority of query string values over defaults

Fixes #28