Refact Query Option Builder