[#71906380] Set markers and also some js cleanup