Fix tag filtering. Minor style fixes.