fixed regex
added search query