1. some bug fix
2. search form