Added code to exclude facilities from messages