Excracting method in to two
Fixes for filtering areas