cleaned up / added 'link' and 'query' capability