#20 More work on metadata querying