bug fixed and noEntryFound implemented