Fix minimum matches
Fix tag order layout.