various changes to simplify overlap matching with features of interest