Better handling of different length analog/marker

--CAR