add Search and some little fix