Small modifications for BBOXQueryForm buffer filter