Unescape after DB

Change-Id: I0d91909468e3b370ee2812bca6fe0f3b78cd32ad