resolve now handles complex queries - need to join