I will test both suggestions when I get back to this.