Search, Type Fixes