Merge "Fixed autofill filter comparison." into oc-dev