improved sidebar completion