Merge pull request #61 from luisromangz/8.2-ohiggins-SNAPSHOT

Fixed #80959, #80976
Merge pull request #62 from luisromangz/8.2-ohiggins-SNAPSHOT

Fixes #81030: we cannot write in the criteria selection combo.