Refactoring init/refresh sequence and adding date filter