Reformatting
Specs and implementation for the search API.