speedup form option completion #318 and add new custom abstract references replacement for #313