This commit adjusts the area that needles look for to avoid checking based on a menu item that has disappeared from the system.
Merges #86 Fixes #85