Commit f4ee8bf is an attempt at my second suggestion above. If we can filter by multiple values at once, that's still worth me coming back to, because it would make multiple-area queries more efficient.