1145 Commits (fix-filter-service-bug)