Simplified lookups
Fixed search order