Fixed various errors in page types handling