CC-19 Added TS Query support for project name