Fix reselecting --- in query form