Made search conform to spec better