bounded query frontend implementation
fixed conflicts
fixed more conflicts