Added custom Block highlight handling