Fixed issue: fix similiar #246 issues on page admin