Minor fixes
Fixed map device icon status
Handled pagination