Fixed search by Type bug