Remove collective.transmogrifier version pin on master.  Master for both packages seem to work together correctly now, and this pin causes buildout errors when developing with collective.transmogrifier master.
Make catalogsource query parser use ; separated terms as a list, rather than splitting and just taking the last term.