Removing withFilter since that's azure specific