fix #829, do search with reload & support viewchange on search result
Merge branch '2.x' into 2.1
Merge branch '2.1' into 2.1_n