improve jsonpath support