Multiple bugfixes for wayf filter.