Removing redundant QueryUnescape

Also simplifying switch statement to not also include assignment.

Signed-off-by: Sheena McCoy <sp.mccoy@modcloth.com>