match in between highlights panel fix #2