searching for short form is now more accurate