Changed support/common_funcation queries

Changed support/common_funcation queries