Fix Data Source redirect to 404 in combination with required/forbidden parameters

Closes #1642