Add filtering support, improve output, serialize uploads