Use bundle id
Transition correctly on searches and handle errors