Improved popup handling
Added combo detector