[urbng 212] small improvements