added keyword, cleaned code improved search system