Cleanup

search and snippet bug fixes