Added iRate and removed google maps workaround