CLOUD-196 #time 1h Fixing issue with title (also helping Rob with some issues)