In mapindex move check for default map into separate method.
Merge pull request #394 from 4144/mapindex

In mapindex move check for default map into separate method.