Currently user's query is overwritten when Expand button is clicked. Should use an extra field on the frame record