Updated search command to be same as ec2 version. Includes msg template