Map search bugfix