Update broken implementation. Change query execution.