[minor] fix no matches label bug, other minor fixes