Fixes for the ObuForm CQL filter management