Search field consistency with combinations and fix for WS