Fix filters (shiro still not working)