some fixes for map and older cell scan

(tested on 4.1.2 device)