Fix the --query to enable filtering for multiple, different elements in the messages