Prevent redundant server blocks. Change status enum