Updated rule cache warming queries to be more effective

The previous cache warming queries were not getting much results. With these few updates, it gets a little better.