aH.matchesEntityType adjustments