Fixing search for entry_id

- Adding a check that was missing cause the search to fail
- Committing 2 files that were not saved before the previous commit