add state for PIs
add query filter to wsapi objects ahead of time