Fix issues with parallel errors. Added faster grepping of apis