Better duplicates search. #30
Add Source type to S. #30.