BS-11577 - Fix logs and URL mapping