portal check for subtypes and add indexes logic

portal check for subtypes and add indexes logic #2178