adding changes to fix google picker bug