Fix baobab query