Accordion fixes, marker names fixed