restored autocomplete and panto marker function
some fixes