Improve additional source folders selection