Skipping defaults while populating filters

Hi @dhermes, I just made a new simple commit with the changes to keep it clean.