URBNG-280: Made some adjustments