[ContentSystem] Fixed #342
[PageSystem] Fixed #343