bug fixes
using whitelisted app id