Move license to before content, and add ID to text query