Changes to the attribute filters (gives us more flex to derive and
adjust).