Bugfixes and enhaced search feature with n/p navigation keys