Improvements for BBOXQueryForm