better handling of non-puzzle pages