Check features based on plan details instead of plan name

Check features based on plan details instead of plan name #1372