Optimized active record queries by adding includes