Fix query again...