updated query + extended actions