Fixing additional bugs for finding specific buttons