Removing duplicate query keys for empty query no longer throws and exception.

Fixes issue #7.