Fixed up the custom finder part