Pinyin is a poor guide for pronunciation clues
"Pronunciation clue for 辟 (pi4): The component 尸 is pronounced as 'shi1'. It has the same pinyin final."
This is clearly not the same final. It's the same final LETTER as transcribed in pinyin, but that is all. Better would be to rely on zhuyin, where ㄕ and ㄆ
ㄧ have distinct transcriptions. A quick hack would be to not treat pinyin ...hi as the same final as ...i