Fixed few pages allowing invalid id