- updated capture mapping
- optimized query in resource index