Improved handling of Examine action