Added map search layer management