Improve support for markers that aren't images