stop / map urls fixup
better api reuse