All queries should be optimal now