Added secondary search.
TODO: Fix FileComplete Issue.