CON-1240 | Small tweaks for suggestions