liquid/3.x database re-structure fixes