Added a flag to enable or disable tagging of windows.