Add more lookup options for completion