Preliminary shield fixes [ci skip]
Remove the session lookup
Don't double filter the query when using the new version of shield.
Merge pull request #34 from armet/shield

Update shield usage.