Add unresolved-ESInputTag handling