switched searches to use proper relationships as well