More FetchBy fixes