refactor 4s query to use querystring
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev