Jumped the gun on form selector and added extra check in update method for announcements