@Steve We are migrating to Postgres, and it requires Partition Key to be part of all queries to do Partition Pruning because of lack of Global Index. So, we were using Filter to dynamically add the Partition Key to our queries. Now, if it doesn’t work on Session.find, then those queries will be fired without our Partition Key resulting in performance issues. Do you have any recommended solution for this? We have a legacy system and manually making code changes at all places is not feasible.