Improved hover support and improved performance

Change-Id: I779a30c1625fd38df54931c28e41e68fca86de92
Signed-off-by: mstegmaier <michael-1.stegmaier@uni-ulm.de>