Some tweaks and fixes raised by working on TISTUD-2797 Offer content assist on TSS keys - classes and IDs