Improved search, included in API