missing elements added (more todo)
json include ... plan and adverts together in the controller...