fixed expand query to come back up