Add rich query endpoint.