Fix ever-growing supported models list for multiple ESD matches

- fixes #7