Fixed the interplay between fields, include/exclude_partial and _source