Filter only on enabled() where relevant

Fixes #3270 and should close off #3248 as well. Thanks, @julen!