change an important query due to the change of db structure as of v33_1