refactored heat map and marker map to use same form for filtering