Added match highlighting to blocks