Added notification timer option
Better domain matching to support ports