Fix hover item, but no tests yet

Change-Id: If5d112ba9e93d0f040be5f4b3f18116c14263b06