Share more common code
Fix Type and Module name filters to match
Replace some hashtables with dictionaries