Improve not-mappable logic

Spot returns message types and/or lat/lng that aren't mapped. This
improves the mappable scope to filter these out.