Improved the speed of the entry search

- Various other improvements/changes