Remove headerv2 partial and update sample_data.rake
Fix tag filter
Fix merge conflicts