Fix add-on list query to add plan code to add-ons