Refined symbolsource discovery logic

Refined symbolsource discovery logic