Add query parameters to the signature generation
Add tests for removing components