Keep sources as a list
remove unused template
Fix source filtering