Removed duplicated code for searching for apps
Added base search class