Better type and area filtering
Two databases, no more buffer