823 moveIfneccessary fixed 116 - only active contractors in tables