improved notfound plugin
refactoring
refactoring [2]