Better handling of in_app