Html and Json Controller
Merge fix