fix finders in BaseModel