Improve arel query.