Revert "Add support for facet filter parameters that have special additional parameters"

This reverts commit e60119607c8e4ddbbabc0283de5dbae065f6b15e.