Fixes #50: Query string gets lost on "device_view=XXX"
Merge pull request #53 from netmikey/fix_deviceview_query

Fixes #50: Query string gets lost on "device_view=XXX"