Fix stage position check to include non-XML metadata