Switch to using Type for searches