Added fail fast option, escape html, and perf fix