fix bug in search time
fixed update changing order
Merge commit '25f07a1cccdba061f5394e2faca9fcbc142be9af' into ui/victor