Fix saving support
Clear buffers before populating
Fix #32 Support filtering based on tags