URI encode query
Merge branch 'master' of github.com:Asimov4/milestone