Remove country when not defined in query options

Removes the inclusion of `country=` from the query parameters when not defined in the query options hash

Edit out some whitespace issues