Various Fixes, new data module for filtering tables