db schema change and related query change --KW