QueryParser Driver: Improve format filter