Add more filters and functionality for SP