Add user filter and support of special folders