fix subnav loadmodal bug
Merge branch 'development' into imports