Changed structure of filters wrapper