Simplify search and eager load associations