bug fixes
Merge remote-tracking branch 'origin/twitter-search' into twitter-search