updated for search and 0.9.0 feature freeze