[dannunzio] couple of tweaks to returning content