Improved search on entries by icr delete on entries.

Polished comments.