Don't double filter the query when using the new version of shield.