Removed next query and put back name