Changed global vs marker logic to prefer marker, but still respect global setting