Closes #2269 - Restore query and filter from dash.searchSource