Added some more types
Added auto searching on change