Not found pages changes - less code