Fixes and additions to modal JSON control