Great post - thanks. I think the columns in the index you suggested in the pre-pg12 section are in the wrong order (that index would get used)

Thanks - I will recheck later today.