minor update and some fixes on search logic ( query )