Fix lookup commands