FORGE-1699: Performance enhancements for Project location