fix and query performances