fix query again