Updated: add remove_dup for query.