Cleaned up the Query params stuff.
Going to bed.