Can't we move the suffix search into the Resource scan?