[#30] fixed validation and shooter - address relation