Modified some criteria for dynamic fetch