Finally fixed hit test issue

This fixes on screen selection as well as supports.