Fix bug in the skip filter
Fix problem adding layer to the map when there wasn't a map ready