Fixes since query provides query.all