bugfixes in popover