Minor bug fixes

main fix corrected markers to they were still clickable after query