Replaced horrible recursive search with nested promises