fixes for subpages