fixed QueryEdit, ready for beta testing