Update Shark query to match new filter Spark query