Small revision for BBOXQueryForm