Refactor PROJECTS to simplify matching logic
Fix injecting to OTL