Added: option to skip Self-Entries