Changes to filters, NonAttributeWrapper and some exception handling