1. Added filter for workers
2. Template updates