Feature/custom query with arel