Fix latest query