Code cleanup.
In API added search file