Bug fix: compound keys now work again, using the project based queries,
instead of the previous structure.  Fixes [#37]