A few more bug fixes for narrative panel
Add in panel-query