Fixed special page indexing and handling