Fix filtering, now room filtering working like a charm, plus addition refactoring hopefully it will show it now properly on git.