add query and common