LPS-49511 Use ActionableDynamicQuery