Mweb 1043

@nandy-andy @RafLeszczynski @rogatty 
Yes, we need them as escaping html on db queries breaks the promise chain.