Fixed type selection and search (hopefully)