modify handlers to accept query string

I think a CollectionUsageError?