Progress on generic query parameters. Relates to #6.