Add fix for invalid GUID being passed to filter