no back and forth of queryfield expanding. and fix some bugs.