continued development on the Query tab