Changes in rawQuery function.