Js dsc 865

Fix for collectionLu and also genreatl improvements
@ninhnguyen this should fix the job problems