added tag support and tag filtering