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

This fixes #50: Query string gets lost on "device_view=XXX". Feedback welcome, pull too :)