Improved find message to better handle multiple purposes