Improved search

Search is independed for each word