fixed an issue with showing neighboring entries
Merge branch 'develop' into testing