More robust app discovery