Include sources
Fix all entries list bug