rename + opti empty query