Query update

Updated Query and Index