Added more consistent URL parameter usage

I think this is what you wanted to do ;)
I love your project and I am bringing it to good use in my production environment! Thanks!