fixed a bug in edit query
watchlist

improved pointer handling