move resolve logic for find/findQuery in to adapter