merging new identify tool
fixes for new identify tool