Reverted change to ParentLocationId criterion