Include the package name in the search text
Put package at the end of the message