More validation rules to Trackheat and comments
Split up the find and array address to fix a bug