search features cleanup