Fix #25 escape dots in ids