fixes on badge location listing