Improve handling of non-standard stories