big updates for adding actions, linking to queries