More accurate search by taking the type in account