Improving BBOXQueryForm with Buffer selection