enumerate fix, still needs proper testing in search function