Add support for conditional rendering and indexed query targets.