Added ->toLookup()
Fixed few PhpStorm warning