Fix findAll queries.