Fix for key/title lookup issue