Added keepSearchTerm option