Fixed rule highlight issues