Add search query

but, this is toooooo heavy ;(