Clean up staticQuery warnings

## What needs to happen?

update the static query components

## Why should we do this?
it's deprecated 


## When does this need to get done?
not an emergency but nice to have done