[TASK] SQL Updates to prepared statements / optim