added force type and force source to highlighting