diff --git a/app/models/cont_edu_cert_person_models.py b/app/models/cont_edu_cert_person_models.py
index e18f884..3a2aa3b 100644
--- a/app/models/cont_edu_cert_person_models.py
+++ b/app/models/cont_edu_cert_person_models.py
@@ -53,6 +53,10 @@ class Cont_Edu_Cert_Person_Base(BaseModel):
 
     organization_name: Optional[str]
 
+    email: Optional[str]
+
+    cert_type_code: Optional[str]
+
     enable: Optional[bool] = False
 
     created_on: Optional[datetime.datetime] = None
diff --git a/app/routers/cont_edu_cert_person.py b/app/routers/cont_edu_cert_person.py
index 56552a9..68fdc8d 100644
--- a/app/routers/cont_edu_cert_person.py
+++ b/app/routers/cont_edu_cert_person.py
@@ -173,11 +173,11 @@ async def get_cont_edu_cert_person_obj_li(
 # Updated 2021-07-28
 @router.get('/cont_edu/cert/person/search', response_model=Resp_Body_Base)
 async def search_cont_edu_cert_person_obj_li(
-        account_id: str = Query(None, min_length=2, max_length=22),
-        external_id: str = Query('%', min_length=1, max_length=50),
-        given_name: str = Query('%', min_length=1, max_length=25),
-        family_name: str = Query('%', min_length=1, max_length=25),
-        email: str = Query('%', min_length=1, max_length=50),
+        account_id: str = Query(None, min_length=11, max_length=22),
+        external_id: str = Query('%', max_length=50),
+        given_name: str = Query('%', max_length=25),
+        family_name: str = Query('%', max_length=25),
+        email: str = Query('%', max_length=50),
         from_datetime: Optional[datetime.datetime] = None, # based on created_on
         to_datetime: Optional[datetime.datetime] = None, # based on created_on
         limit: int = 50,
@@ -207,10 +207,10 @@ async def search_cont_edu_cert_person_obj_li(
     if enabled in ['enabled', 'disabled', 'all']:
         if enabled == 'enabled':
             data['enable'] = True
-            sql_enabled = f'AND `tbl`.enable = :enable'
+            sql_enabled = f'AND `cont_edu_cert_person`.enable = :enable'
         elif enabled == 'disabled':
             data['enable'] = False
-            sql_enabled = f'AND `tbl`.enable = :enable'
+            sql_enabled = f'AND `cont_edu_cert_person`.enable = :enable'
         elif enabled == 'all':
             sql_enabled = ''