added search and highlighting
added fish locking